4baee89615
Merge pull request #38699 from Irafas/HardsuitEyeFix
...
Hardsuit helmets protect eyes from pepperspray
2018-06-25 09:19:58 -05:00
01eb1bc7fe
[READY] better contraband crates ( #38321 )
...
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-21 18:52:15 -05:00
db25067491
adds missing /'s at the starts of some obj instances ( #7169 )
2018-06-18 11:53:33 -07:00
fb53413ded
Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270
...
[MIRROR] [READY] advanced foam extinguisers [READY]
2018-06-18 12:28:42 -05:00
c58dbc1110
Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476
...
[MIRROR] [s] Fix launchpads creating way too many sparks
2018-06-18 10:09:42 -05:00
8393a6b34b
Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510
...
[MIRROR] Cleans up the chem synths jesus christ what the fuck
2018-06-18 09:52:24 -05:00
1a42719d80
Advanced foam extinguisers ( #38270 )
...
* mining voucher tweak
* will it blend
* d
* s
* ss
* advanced fire extinuishers
* remove trash
* garbage cleaning
* lets see
* t
* whatever
* test if using a var compiles
* adds it to cargo
* adds to atmos + ce
* should fix the sprites
* lowers the volume of the foam tank
* gonna load the icon for this soon
* woops
* foam icon
* ddd
* it works
* boo
* r34ijfirgv5
2018-06-18 09:38:07 -05:00
5ee2ee38b3
Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers."
2018-06-16 16:18:50 -05:00
cc54931a66
Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434
...
[MIRROR] Fixes chem heater trying to heat up empty beakers.
2018-06-16 16:18:42 -05:00
e95851c8f6
Merge pull request #38476 from AutomaticFrenzy/patch/sparks
...
[s] Fix launchpads creating way too many sparks
2018-06-16 15:53:42 -05:00
899d1e2d73
Cleans up the chem synths jesus christ what the fuck
2018-06-16 15:38:22 -05:00
bf4be90f76
quickie fixies ( #38511 )
2018-06-16 06:16:56 -05:00
eafb25535a
[MIRROR] Adds a new drink: Peppermint Patty from Archer! ( #7094 )
...
* Adds a new drink: Peppermint Patty from Archer! (#38427 )
* Sprites!
* S_______ W________
* Candyland snuck into pr... Check!
* removal of candyland extract
* candyland but not the sprites yet.
* fixes :)
* Whoops, lets fix that too
* Adds a new drink: Peppermint Patty from Archer!
2018-06-15 02:46:40 -07:00
ae9c3f4b83
[MIRROR] You can see what other people eat or drink ( #7101 )
...
* You can see what other people eat or drink (#38395 )
* Makes drinking message visible to others
* Makes swallow message visible to other people
* Adds visible messages for eating
* Update snacks.dm
* Update snacks.dm
* Update objs.dm
* Update drinkingglass.dm
* Update pen.dm
* Update drinkingglass.dm
* Update drinkingglass.dm
* Update drinkingglass.dm
* Update drinks.dm
* Update condiment.dm
* Update snacks.dm
* Adds a few extra reagents to the borg shaker
* Update drinkingglass.dm
* Update drinkingglass.dm
* removes blood as a borg shaker reagent
* You can see what other people eat or drink
2018-06-13 20:31:38 -07:00
549d6f0ab8
Fixes chem heater trying to heat up empty beakers.
2018-06-13 04:25:28 -05:00
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
1d1dc1aca8
Disallow effects from being scanned by the chameleon projector ( #38017 )
...
* henk
* iseffect
2018-05-25 07:38:01 -05:00
9ff3e78bbb
Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598
...
[MIRROR] Adds grenadine.
2018-05-23 22:26:44 -05:00
db87f3dbae
Merge branch 'master' into upstream-merge-37598
2018-05-23 07:44:52 -05:00
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
e57cf81636
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
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
3d0f914a2c
Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
...
[MIRROR] Adds Fernet, a digestif that reduces your satiety.
2018-05-19 09:15:46 -05:00
cad56985a0
Merge pull request #6799 from Citadel-Station-13/upstream-merge-37894
...
[MIRROR] Fixes dizziness on some drinks
2018-05-19 09:14:46 -05:00
3e0eaa5e65
fixes g.blaster, neurotoxin, nuka cola dizzines ( #37894 )
2018-05-19 05:32:28 -05:00
7f66ccfc2b
Removes inherent toxin damage from lipolicide ( #37874 )
...
* Removes inherent toxin damage from lipolicide
* Update description of lipolicide
2018-05-18 16:47:20 -05:00
204043bc26
Update borghydro.dm
2018-05-17 23:44:58 -05:00
348b350295
Update alcohol_reagents.dm
2018-05-17 23:44:47 -05:00
e2bcf82341
Adds Fernet, a digestif that reduces your satiety.
2018-05-17 10:19:40 -05:00
8efc7711a7
Merge branch 'master' into upstream-merge-37423
2018-05-16 12:17:57 -05:00
f9f42658e1
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
...
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
3ce9fba8bf
Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
...
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
aee0160a25
Update drink_reagents.dm
2018-05-13 10:15:57 -05:00
6d5e085fd0
Update alcohol_reagents.dm
2018-05-13 10:15:26 -05:00
8463204549
Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
2018-05-12 18:53:59 -05:00
021f30f0c0
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-11 17:30:32 -05:00
ec3516ea19
[s] Hallucinations 4.0
2018-05-09 16:15:58 -05:00
bc6fbeb9fe
Adds (fake) ambient occlusion as a client preference
2018-05-07 22:08:08 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
d09ae95d42
Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) ( #37609 )
...
* Update alcohol_reagents.dm
* removes period
2018-05-02 17:31:22 -05:00
4a7f656823
Adds grenadine.
2018-05-02 13:13:29 -05:00
2fe4591a12
Adds 5 new drinks
2018-05-01 13:42:48 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
6f13d2c2e9
Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
...
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
Jordan Brown