deathride58
a539f6103a
Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881
...
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
2018-01-26 15:50:38 +00:00
Jordan Brown
f2d75f1439
Merge pull request #34881 from Robustin/paxPK
...
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
2018-01-26 02:59:45 -06:00
ShizCalev
e4a96fe2cd
Syringe update_icon sanity
2018-01-26 02:59:21 -06:00
MrDoomBringer
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
ShizCalev
fb86cf6878
Fixes syringe icons ( #34704 )
2018-01-22 12:01:02 -06:00
deathride58
257ee69202
Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360
...
[MIRROR] Fixes clownborg sprays not recharging
2018-01-13 20:29:01 +00:00
Leo
e8d21ac1f3
Merge pull request #34360 from kevinz000/patch-429
...
Fixes clownborg sprays not recharging
2018-01-13 13:25:24 -06:00
oranges
8c1c9f5cd7
Merge pull request #34161 from ShizCalev/bot_sssembly
...
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 04:23:03 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
349b0f4f20
Update spray.dm
2017-12-19 17:19:05 -06:00
LetterJay
fdfdaa230a
Update glass.dm
2017-12-19 17:18:27 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
LetterJay
3c5632bad2
Update pill.dm
2017-12-17 17:38:51 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Ashe Higgs
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
CitadelStationBot
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
coiax
6846e87ae2
Silver slime extract foods now fry correctly ( #33309 )
...
* Silver slime extract foods now fry correctly
The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.
- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.
* Contains
2017-12-10 17:42:20 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
Mark9013100
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
ShizCalev
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
arsserpentarium
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
Leo
c11dc9d20f
Merge pull request #32560 from Mark9013100/11/9/17_char_antitox
...
Renames charcoal bottles
2017-11-10 09:10:41 -06:00
Tad Hardesty
144df6c549
Fix a few syntactic aberrations ( #32284 )
2017-11-02 04:21:51 -05:00
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
