Commit Graph
23 Commits
Author SHA1 Message Date
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-09-17 12:54:02 +02:00
WanderingFox95andGitHub 7884ccf316 Only 5 units are necessary, so why keep it at 10?
I mean, this is the refining process
2021-06-05 14:51:59 +02:00
WanderingFox95andGitHub e69729beb4 So he doesn't need sodium thiopental after all.
Turns out Furranium has a knockdown.
2021-05-31 12:15:16 +02:00
WanderingFox95andGitHub ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
necromanceranneandGitHub a4313ee101 Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675) 2020-03-29 17:45:01 +02:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
ThalpyandGitHub 1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Fermi 17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
Fermi b6788cdd64 Updated projectile sprite. 2019-06-08 01:45:32 +01:00
Fermi 42d0ab4825 Comment cleanup. 2019-06-08 01:31:21 +01:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Fermi 2888e1b30b Dartgun functions as intended. 2019-06-07 00:12:11 +01:00
Fermi 1a42c017ac DEBUG 2019-06-06 23:23:53 +01:00
Fermi fd22dbfc0d More fixes. Need to check over merging math. 2019-06-02 03:59:52 +01:00
Fermi 0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
CitadelStationBotandPoojawa c72201e605 [MIRROR] Splits projectiles into different files for readability (#5800)
* Splits projectiles into different files for readability

* Update tgstation.dme

* I love how the dme cleans itself up
2018-03-05 14:13:08 -06:00