Commit Graph

42722 Commits

Author SHA1 Message Date
keronshb
be2e962983 Off Balance for Guns only again
Was intended for guns
2021-05-04 00:51:16 -04:00
keronshb
c5aeaf97fe Merge remote-tracking branch 'upstream/master' 2021-05-04 00:29:29 -04:00
CitadelStationBot
0f73f9d9fd Automatic changelog generation for PR #14673 [ci skip] 2021-05-03 22:08:39 -05:00
silicons
45bc4fcb46 Merge pull request #14673 from TheObserver-sys/SovietCrate
Soviet Crates, now available!
2021-05-03 21:08:37 -06:00
silicons
2bf9c9d21f Merge pull request #14678 from SandPoot/fancy-gateway
Ports #55624 from tgstation
2021-05-03 21:07:03 -06:00
Changelogs
8f47d0ecf9 Automatic changelog compile [ci skip] 2021-05-04 00:22:20 +00:00
Changelogs
6887e2d097 Automatic changelog compile [ci skip] 2021-05-03 00:28:19 +00:00
SandPoot
8f3a44f44a fancy gateway 2021-05-02 18:57:04 -03:00
CitadelStationBot
27fa3a9855 Automatic changelog generation for PR #14670 [ci skip] 2021-05-01 20:18:52 -05:00
silicons
e2dd3a32b8 Merge pull request #14670 from TripleShades/general-fixies
General main map fixes + touchups
2021-05-01 19:18:50 -06:00
Changelogs
a745d1288c Automatic changelog compile [ci skip] 2021-05-02 00:30:35 +00:00
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
The0bserver
9800af9525 Merge remote-tracking branch 'Upstream/master' 2021-04-30 20:48:12 -04:00
Changelogs
d59dbfbfda Automatic changelog compile [ci skip] 2021-05-01 00:27:12 +00:00
CitadelStationBot
567d43c9dd Automatic changelog generation for PR #14668 [ci skip] 2021-04-29 22:24:03 -05:00
Lin
c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
2021-04-29 22:24:00 -05:00
Changelogs
2cb353890e Automatic changelog compile [ci skip] 2021-04-30 00:25:57 +00:00
TripleShades
0c85455227 god i hate areas 2021-04-29 15:09:33 -04:00
TripleShades
ee3b69989b Update PubbyStation.dmm 2021-04-29 14:20:11 -04:00
TripleShades
e0eca566a9 Update PubbyStation.dmm 2021-04-29 14:04:04 -04:00
CitadelStationBot
0c803e0232 Automatic changelog generation for PR #14639 [ci skip] 2021-04-28 22:20:59 -05:00
silicons
e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
CitadelStationBot
29aee4005c Automatic changelog generation for PR #14648 [ci skip] 2021-04-28 22:20:26 -05:00
silicons
986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
CitadelStationBot
b69b2bc72c Automatic changelog generation for PR #14647 [ci skip] 2021-04-28 22:20:04 -05:00
silicons
4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
CitadelStationBot
74a5e0d051 Automatic changelog generation for PR #14649 [ci skip] 2021-04-28 22:17:58 -05:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
CitadelStationBot
914a5c7930 Automatic changelog generation for PR #14651 [ci skip] 2021-04-28 22:17:38 -05:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
CitadelStationBot
fc2bf6c24d Automatic changelog generation for PR #14659 [ci skip] 2021-04-28 22:17:17 -05:00
silicons
17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
CitadelStationBot
86ad5fd32d Automatic changelog generation for PR #14635 [ci skip] 2021-04-28 22:17:08 -05:00
silicons
9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
CitadelStationBot
152c88fe46 Automatic changelog generation for PR #14636 [ci skip] 2021-04-28 22:17:00 -05:00
silicons
86bdb2455d Merge pull request #14636 from TheObserver-sys/CrateDeal
Inconsistency Fixes, 10MM Rifle tweaks.
2021-04-28 21:16:58 -06:00
CitadelStationBot
82d166017c Automatic changelog generation for PR #14643 [ci skip] 2021-04-28 22:16:53 -05:00
silicons
b108a6fe7e Merge pull request #14643 from necromanceranne/space_adapt_resprite
Changes the space adaptation sprite to something more subtle.
2021-04-28 21:16:51 -06:00
Changelogs
a331f24121 Automatic changelog compile [ci skip] 2021-04-29 00:06:31 +00:00
CitadelStationBot
85ec8aa5a0 Automatic changelog generation for PR #14666 [ci skip] 2021-04-28 15:56:18 -05:00
Putnam3145
8f14424a63 Fixes a couple runtimes in activity tracking (#14666) 2021-04-28 22:56:15 +02:00
qweq12yt
3afb801036 huh 2021-04-28 15:41:20 -03:00
CitadelStationBot
b19a2cd975 Automatic changelog generation for PR #14641 [ci skip] 2021-04-28 07:09:39 -05:00
keronshb
6d86809616 Removes the Reinforcement Chromosome from Genetics. (#14641)
* Removes Mutadone Proof from Genetics

This might be a bit too good.

* Fixes so mutadone actually works

Oops

* Removes the reinforcement chromosome

Removes the reinforcement chromosome
2021-04-28 14:09:37 +02:00
Lin
01f430e5de Merge pull request #14665 from Citadel-Station-13/silicons-patch-27
ah i forgot a ! in my boolean logic again
2021-04-27 19:51:33 -05:00
Changelogs
604d5e2fbc Automatic changelog compile [ci skip] 2021-04-28 00:06:38 +00:00
Changelogs
810eba15ed Automatic changelog compile [ci skip] 2021-04-27 00:06:17 +00:00
silicons
03fa382f36 Update autobunker.dm 2021-04-26 13:57:34 -07:00
Changelogs
3fac51374f Automatic changelog compile [ci skip] 2021-04-26 00:06:42 +00:00
CitadelStationBot
44c2a9eecd Automatic changelog generation for PR #14642 [ci skip] 2021-04-25 18:10:11 -05:00