ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
0e630680ba
forgot to pull from upstream. One second.
2019-06-06 15:20:27 +02:00
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
41375d9737
Increases performance significantly by turning garbage collection into a define
2019-04-14 11:33:28 -04:00
2c9deab42e
removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present
2019-04-14 10:33:39 -04:00
fb234783a7
muzzle-compatible helmets and masks
2019-04-12 04:00:47 -05:00
8b75240d89
fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive
2019-04-11 17:07:11 -04:00
4c19f4a50a
you're too exhausted to be lifted up - makes it much harder to force someone to stand if they're in hard stamcrit ( #7683 )
2018-10-30 19:29:08 -07:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
359d31238d
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
832f071b59
mob stuff
2018-04-23 02:26:53 -05:00
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
9b8ca10da2
Merge pull request #36856 from iskyp/resin+egg
...
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 11:11:38 -05:00
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
6c7da493d9
Reee mirror bot. Hard syncs some missed PR stuff + maps ( #5951 )
...
* maps and tgui
* missed defines and helpsers
* controller things
* datums
* game folder stuff
* module things
* icons
* stragglers
* map sync and updating
wew lad
2018-03-14 16:49:40 -05:00
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
759444c148
Removes xeno stun and stamina immunity ( #5616 )
2018-02-23 19:18:52 -06:00
567c7fad8d
[MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold ( #5674 )
...
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796 )
* - Stop subtracting from bodytemp please
- Also fixes shivering
* - Jesus christ why did you make me do this
* - missed one
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
833a700cbb
Fixes invalid throwat args ( #35565 )
2018-02-13 07:14:47 -06:00
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
9e229691cc
Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines ( #5304 )
2018-02-05 04:23:09 -06:00
e2ce020a62
[MIRROR] Fixes a couple of typos and ports one New to Initialize ( #5233 )
...
* Merge pull request #35145 from vuonojenmustaturska/acidtypos
Fixes a couple of typos and ports one New to Initialize
* Fixes a couple of typos and ports one New to Initialize
2018-02-04 22:11:07 -06:00
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
90b2e77b78
Merge pull request #34769 from ShizCalev/var-cleanup
...
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
5cc7492f0a
Merge pull request #34187 from ShizCalev/butcher-droplocation
...
Switches butchering/gib drops to use drop_location
2018-01-10 03:12:39 -06:00
85aa297923
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:30:41 +00:00
7956e3df27
Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
2018-01-07 11:02:49 -06:00
8f593f0d00
living carbon
2018-01-04 01:36:28 -05:00
c41bf82380
Fixes observers not being transfered to new mobs ( #34039 )
2018-01-03 07:33:53 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
d7723a064c
Spell action buttons finally fixed ( #33882 )
...
* Action button fix
* Action button fix
* Spell action button fix
* Spell action button fix
* Update alien_powers.dm
* Update spell.dm
* Action button fix
* Update touch_attacks.dm
2017-12-29 02:54:50 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
e933d69a22
Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302
...
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
2017-12-18 15:27:12 -06:00
e93bb49994
Spinning resin or laying eggs on vents prompts the user if they're sure ( #33302 )
...
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.
This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
2017-12-17 19:27:45 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
7c1fe79635
Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
...
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
kevinz000