KorPhaeron
9f7a7bcc22
Vampire species for halloween
2017-10-26 11:55:40 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
8ae369bf77
Update bottle.dm
2017-10-16 07:54:02 -05:00
vuonojenmustaturska
11eff73897
Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
2017-10-16 00:00:52 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
Jordan Brown
58fd7f2067
Merge pull request #31413 from vuonojenmustaturska/codejanitoring
...
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
LetterJay
9f01bf378d
Update hypospray.dm
2017-09-30 14:20:25 -05:00
oranges
a4992bae90
Log attempted injections as well as successful ones
2017-09-29 15:57:50 -05:00
CitadelStationBot
2ab0c3696e
[MIRROR] Fixes it so patches do not work on robotic limbs. ( #2893 )
...
* Merge pull request #30851 from Firecage/nopatchesonnonorganiclimbspleaseandthankyoumistergoof
Fixes it so patches do not work on robotic limbs.
* Fixes it so patches do not work on robotic limbs.
2017-09-22 04:46:19 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
00199af27d
Merge branch 'master' into upstream-merge-29866
2017-09-06 09:21:53 -05:00
kevinz000
28ea6f3ad2
Merge pull request #2499
2017-08-29 22:43:54 -07:00
kevinz000
8693a933b4
Merge pull request #2482
2017-08-29 22:27:42 -07:00
kevinz000
fcddd32703
Merge pull request #2195
2017-08-29 22:26:58 -07:00
kevinz000
1b0bbb8c86
Merge branch 'master' into upstream-merge-30113
2017-08-29 20:02:14 -07:00
kevinz000
3f16272717
line endings ree
2017-08-29 19:57:58 -07:00
kevinz000
5f5065eb46
kek
2017-08-29 09:59:57 -07:00
kevinz000
064ade469f
sync
2017-08-29 09:35:55 -07:00
kevinz000
498bd61928
sync
2017-08-29 09:12:56 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
cd11c01c42
Adds magillitis, a traitor serum for geneticists & CMOs
2017-08-26 11:07:42 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
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
kevinz000
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
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
5eea016593
You can now click on symptoms in the Pandemic to see their description and stats
2017-08-19 18:52:55 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
edf7c03070
Multiple inhand sprites fix
2017-07-30 19:58:18 -05:00
CitadelStationBot
2d82262e50
Fixes syringes being unable to inject at all if the target has thick clothing on any slot ( #2184 )
2017-07-29 19:50:37 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
194a6b7aa9
[Seriously, it's ready]Virology Rework: The Thresholdening
2017-07-13 17:46:25 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
08eaad468a
Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid
2017-07-09 06:43:42 -05:00
CitadelStationBot
beccb4742f
Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
2017-07-06 09:14:03 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
e680da7de6
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
...
[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
CitadelStationBot
6a38955803
Adds container types INJECTABLE and DRAWABLE
2017-06-27 08:19:49 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
LetterJay
4624ec7e04
upstream-merge-27899
2017-06-11 00:09:55 -05:00
CitadelStationBot
acbaa45aee
Adds a few new recipes created with plastic sheets ( #979 )
2017-05-18 11:53:17 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
6718ea096d
Merge pull request #937 from Citadel-Station-13/upstream-merge-27148
...
[MIRROR] Buffs honey
2017-05-14 16:30:51 -04:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
b9ad2c31c9
Buffs honey
2017-05-13 18:00:53 -05:00
CitadelStationBot
46d7976488
Adds spewium toxin in traitor kits
2017-05-04 17:53:42 -05:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
