ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
e0412f6325
Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-06 16:37:13 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
18716c03a5
Analyzers show temperature in Kelvin as well as Celsius now ( #37441 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* wew
* nicbn
2018-04-27 02:28:21 -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
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
0a449af83e
Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 14:38:18 -06:00
951a580759
Fixes a dumbo runtime error in the analyzer's barometer function. OOF. ( #35902 )
...
* Fixes a dumbo runtime error in the Barometer function. OOF.
* Moves butchertime stuff into a proc.
2018-02-23 09:07:53 -06:00
03dfbe7137
[MIRROR] Ports Barometers from Yogstation ( #5647 )
...
* Ports Barometers from Yogstation (#35730 )
* Ports Barometers from Yogstation
* Ports Barometers from Yogstation
* Added missing barometer_predictable bools
* Gives the atmos analyzer love instead of a new item.
* Moves playsound under cooldown to prevent soundspam.
* Ports Barometers from Yogstation
2018-02-21 19:44:20 -06:00
1e65c813f0
[MIRROR] Extensive surgery additions ( #5590 )
...
* Extensive surgery additions
* Update role_preferences.dm
* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
298b37cacb
[MIRROR] Makes slime scanning more readable ( #5314 )
...
* Merge pull request #35274 from XDTM/SlimeScan
Makes slime scanning more readable
* Makes slime scanning more readable
2018-02-05 00:46:52 -06:00
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -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
f26f1b5370
Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
...
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
23e5b7f396
Consolidated t-ray scanner code ( #34759 )
...
* Consolidated t-ray scanner code
* Fixed cables not showing up on t-ray scans
2018-01-22 15:45:07 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -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
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
500307b034
Disposal pipes and pipe dispensers refactor
2017-11-12 00:31:00 -06:00
355de66eeb
Allows non-humans to be chem scanned via the health analyzer ( #32457 )
2017-11-07 08:02:22 -06:00
d04b5cbeef
Ghosts can now Health Scan ( #31640 )
...
* Ghosts can now Health Scan
* cyberbossing
* Update observer.dm
2017-11-02 08:46:42 -05:00
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
8d31153fdc
Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223
...
[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
3ee26917bd
Organ Update [Cloning isn't broken edition]
2017-07-14 09:00:36 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay