Greenjoe12345
a19ddfce0e
Merge branch 'master' into swordsandbow
2022-04-03 21:00:59 +01:00
Spookerton
11f5ed7d2c
Merge pull request #8507 from Atermonera/buckled_hud_color
...
Colors hud alerts according to their master object's color.
2022-04-03 11:17:22 +01:00
Spookerton
ccde0c6cda
Merge pull request #8508 from Atermonera/there_can_be_only_none
...
Removes highlander
2022-04-03 11:16:57 +01:00
atermonera
4d1ae71ce9
Removes highlander
2022-04-02 20:05:56 -08:00
atermonera
ef3486f932
Colors hud alerts according to their master object's color.
2022-04-02 19:41:20 -08:00
Greenjoe12345
b27a278123
better arrow sprite, no material color for gladius
2022-04-03 04:08:11 +01:00
Atermonera
a42e6b3446
Merge pull request #8497 from Spookerton/spkrtn/sys/30-inch-racks-01
...
subsystem pass 1
2022-04-02 17:52:27 -08:00
Atermonera
83ac485925
Merge pull request #8496 from Spookerton/spkrtn/sys/out-with-the-old-2
...
remove some obsolete defines
2022-04-02 17:46:13 -08:00
Atermonera
f8cd43fa69
Merge pull request #8495 from Spookerton/spkrtn/sys/out-with-the-old
...
remove pre-513 compatibility bits
2022-04-02 17:42:59 -08:00
Atermonera
8e617b3056
Merge pull request #8493 from Spookerton/spkrtn/cng/misc2022mar30-1
...
clean up emag resolve_attackby, .orig files
2022-04-02 17:41:31 -08:00
Atermonera
0921064401
Merge pull request #8492 from Spookerton/fenodyreeav/material-armor-crafting
...
adds material armor crafting recipes
2022-04-02 17:41:04 -08:00
Atermonera
3adb6b548a
Merge pull request #8486 from Spookerton/spkrtn/fix/movable-destruction
...
cleans up atom/movable/Destroy + adds walk(src, 0)
2022-04-02 17:39:09 -08:00
Atermonera
d26bff099b
Merge pull request #8485 from Spookerton/spkrtn/sys/atomic
...
isatom as istype /atom --> isloc && !isarea
2022-04-02 17:37:59 -08:00
Atermonera
a3b8f0fd5f
Merge pull request #8481 from Spookerton/spkrtn/fix/8451
...
adds client helpers, fixes an oversight from 8451
2022-04-02 17:36:43 -08:00
Atermonera
b0cff25a29
Merge pull request #8476 from Spookerton/spkrtn/cng/default-fps-40
...
default client fps is 40 instead of match-server
2022-04-02 17:35:25 -08:00
Killian
e39f24b49e
Allergen CE Conversion ( #8431 )
...
* WIP allergen conversion
* allergen CE conversion
* allergen CE conversion
inap now actually stops reactions properly
* add brute/burn allergen reactions
* recommended changes
2022-04-02 17:28:25 -08:00
Greenjoe12345
bb24579a29
weapons
2022-04-03 02:27:16 +01:00
Mechoid
4780b1efe5
Planetary Meteors ( #8422 )
...
* Begins work on Planetary meteors
* Work, clean meteor code.
* Continues work. Meteors now handle their own movement and launching.
* New meteor types, some added to waves. Large meteor type fully implemented.
* Fix and adjust for comments.
2022-04-02 17:25:27 -08:00
atermonera
35dbabff5d
Revert "Reagent Geysers, Pump Fixing, Puddles. ( #8268 )"
...
This reverts commit 6996e46ed4
2022-04-02 15:01:17 -08:00
atermonera
c01ddc44b9
Revert "Fix bugsons and an oversight."
...
This reverts commit 222a68bcd7
2022-04-02 14:54:08 -08:00
atermonera
0fbbf49840
Revert ":sadcatthumbsup:"
...
This reverts commit 2278a41211
2022-04-02 14:54:08 -08:00
Spookerton
1a317b45cd
Merge pull request #8429 from Rykka-Stormheart/shep-dev-breath-sounds
...
Breathing Sounds While in Space
2022-04-01 18:34:50 +01:00
Spookerton
201c3cb220
Merge pull request #8441 from Cerebulon/hairnets
...
Adds Hairnets
2022-04-01 18:32:33 +01:00
Spookerton
6651fd8bfd
Merge pull request #8480 from Serithi/master
...
Gives mech autocannon projectiles their own entry with unique sprite and lighting
2022-04-01 18:31:36 +01:00
Spookerton
339b42a690
Merge pull request #8484 from Rykka-Stormheart/shep-dev-defib-pain
...
Adds pain upon being revived with a defib
2022-04-01 18:28:37 +01:00
Spookerton
a8f3898901
Merge pull request #8419 from Sypsoti/changelingredux-1
...
New Changeling Menu
2022-04-01 18:26:26 +01:00
Spookerton
f06dcc071e
Merge pull request #8470 from Verkister/patch-89
...
Some admin log "usr" fixes
2022-04-01 18:25:29 +01:00
Spookerton
24ec2b2c66
Merge pull request #8468 from Verkister/patch-88
...
Fixes catwalks making footsteps on everything
2022-04-01 18:25:02 +01:00
Spookerton
8c7324bd60
Merge pull request #8465 from listerla/whatificouldspell
...
Corrects spelling of a Zaddat shroud
2022-04-01 18:24:45 +01:00
Spookerton
921bf58cef
Merge pull request #8477 from Cerebulon/holomaps
...
Fixes missing colouration of station holomap
2022-04-01 18:24:16 +01:00
spookerton
2754e8a2db
improve tgui subsystem fire(
2022-03-31 20:27:07 +01:00
spookerton
26a8ee2c0d
normalize subsystem wait time / ticks lines
2022-03-31 20:26:29 +01:00
spookerton
01b1a22a11
massage subsystem definition for read/maintain
2022-03-31 20:25:42 +01:00
spookerton
2dda71ecf0
remove ATAN2 define
2022-03-31 19:23:29 +01:00
spookerton
b4c3fe9eeb
remove TAN define
2022-03-31 19:22:42 +01:00
spookerton
7fd5fd66b8
removed CLAMP01 define
2022-03-31 19:22:07 +01:00
spookerton
602cc67d2b
removed CLAMP define
2022-03-31 19:21:58 +01:00
spookerton
bcfe3e9851
remove pre-513 compatibility bits
2022-03-31 19:16:36 +01:00
spookerton
5e7a007e47
clean up emag resolve_attackby, .orig files
2022-03-30 15:43:28 +01:00
spookerton
9fa7760234
default client fps is 40 instead of match-server
2022-03-30 15:04:45 +01:00
spookerton
b61156cefe
adds client helpers, fixes an oversight from 8451
2022-03-30 15:04:29 +01:00
spookerton
5212706f3d
cleans up atom/movable/Destroy + adds walk(src, 0)
2022-03-30 15:04:11 +01:00
spookerton
f6bcff8f36
mirror bay/31809
...
https://github.com/Baystation12/Baystation12/pull/31809
2022-03-30 15:03:56 +01:00
spookerton
209caf444c
adds material armor crafting recipes
2022-03-30 15:03:27 +01:00
atermonera
861154df4d
Revert "Fixes assorted mining toolspeed uses"
...
This reverts commit bd236dbdcf
2022-03-29 16:19:36 -08:00
atermonera
c7f1880394
Revert "What was supposed to be another straightforward major system overhaul that once again spiraled out of control ( #8220 )"
...
This reverts commit 4d8c43f106
2022-03-29 16:01:32 -08:00
atermonera
20b60157eb
Revert "A KNIFE!"
...
This reverts commit 0dabd4a717
2022-03-29 15:54:14 -08:00
atermonera
92c041be7f
Revert "makes drills great again"
...
This reverts commit 8f2eb5da7b
2022-03-29 15:53:40 -08:00
Rykka Stormheart
17e38ea58c
Update code/game/objects/items/devices/defib.dm
...
Co-authored-by: Spookerton <spkrtn@pm.me >
2022-03-28 02:03:55 -06:00
Rykka
9bd77e462e
Adds pain upon being revived with a defib
...
As stated.
When brought back to life, you're given a moderate amount of pain to simulate the defib pain.
2022-03-27 19:31:05 -06:00
