3009e8085f
Reduces Station aquirable stamina heals ( #7593 )
2018-09-26 12:38:49 -07:00
7b4c5658e5
Merge pull request #7566 from Poojawa/action-buff
...
Buffs Action, Promotes fun
2018-09-26 15:24:58 -04:00
967a535aeb
New Reagent, Universalizes Survival Medipen ( #7570 )
...
* New Reagent, Universalizes Survival Medipen
Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.
* code alter
adds * to the REM.
* additional code fix
removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
2018-09-26 12:07:00 -07:00
5b17fbdbdb
buffs changling adrenal OD damage
...
also attempts a revive of travis without PR spam
2018-09-26 01:22:04 -05:00
12a9989a7c
runtime fixes
2018-09-22 04:06:06 -05:00
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
9b4b5f87c4
Buffs Action, Promotes fun
2018-09-11 23:42:13 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
b99556c70f
Nanites port from /tg/station, original coder XDTM
2018-08-23 01:16:32 -07:00
f1739cb482
Upstream fix mirror spree ( #7362 )
...
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable
* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms
* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink
* tgstation/tgstation#38988 - Fixes blob victory.
* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button
needs tgui recompile
* tgstation/tgstation#38994 - Fix timer bug
* TGUI recompile
* tgstation/tgstation#39035 - Fixes navigation computers.
* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime
* tgstation/tgstation#39044 - Fixes burgers icons
* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations
* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero
* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo
* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
389faab2a5
Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728
...
[MIRROR] Gives honey antibiotic properties
2018-07-01 09:33:36 -05:00
f244ec31a0
Gives honey antibiotic properties ( #38728 )
...
* Gives honey antibiotic properties
henk
* 0.6
2018-06-26 20:30:41 -05:00
4baee89615
Merge pull request #38699 from Irafas/HardsuitEyeFix
...
Hardsuit helmets protect eyes from pepperspray
2018-06-25 09:19:58 -05:00
db25067491
adds missing /'s at the starts of some obj instances ( #7169 )
2018-06-18 11:53:33 -07: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
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
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
e57cf81636
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -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
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
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
Poojawa