0c8a8fb190
politely cry about it
2021-05-03 21:47:09 -04:00
5b973d6ef4
..........
2021-05-02 23:36:17 -04:00
359c778955
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
6887e2d097
Automatic changelog compile [ci skip]
2021-05-03 00:28:19 +00:00
27fa3a9855
Automatic changelog generation for PR #14670 [ci skip]
2021-05-01 20:18:52 -05:00
e2dd3a32b8
Merge pull request #14670 from TripleShades/general-fixies
...
General main map fixes + touchups
2021-05-01 19:18:50 -06:00
a745d1288c
Automatic changelog compile [ci skip]
2021-05-02 00:30:35 +00:00
d59dbfbfda
Automatic changelog compile [ci skip]
2021-05-01 00:27:12 +00:00
567d43c9dd
Automatic changelog generation for PR #14668 [ci skip]
2021-04-29 22:24:03 -05:00
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
2cb353890e
Automatic changelog compile [ci skip]
2021-04-30 00:25:57 +00:00
0c85455227
god i hate areas
2021-04-29 15:09:33 -04:00
ee3b69989b
Update PubbyStation.dmm
2021-04-29 14:20:11 -04:00
e0eca566a9
Update PubbyStation.dmm
2021-04-29 14:04:04 -04:00
0c803e0232
Automatic changelog generation for PR #14639 [ci skip]
2021-04-28 22:20:59 -05:00
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
29aee4005c
Automatic changelog generation for PR #14648 [ci skip]
2021-04-28 22:20:26 -05:00
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
b69b2bc72c
Automatic changelog generation for PR #14647 [ci skip]
2021-04-28 22:20:04 -05:00
4f73557168
Merge pull request #14647 from SandPoot/limb-grower-tgui
...
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
74a5e0d051
Automatic changelog generation for PR #14649 [ci skip]
2021-04-28 22:17:58 -05:00
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
914a5c7930
Automatic changelog generation for PR #14651 [ci skip]
2021-04-28 22:17:38 -05:00
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
fc2bf6c24d
Automatic changelog generation for PR #14659 [ci skip]
2021-04-28 22:17:17 -05:00
17d7c4dd9a
Merge pull request #14659 from DrPainis/patch-12
...
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
86ad5fd32d
Automatic changelog generation for PR #14635 [ci skip]
2021-04-28 22:17:08 -05:00
9bef72f205
Merge pull request #14635 from necromanceranne/blindfold_but_not
...
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
152c88fe46
Automatic changelog generation for PR #14636 [ci skip]
2021-04-28 22:17:00 -05:00
86bdb2455d
Merge pull request #14636 from TheObserver-sys/CrateDeal
...
Inconsistency Fixes, 10MM Rifle tweaks.
2021-04-28 21:16:58 -06:00
82d166017c
Automatic changelog generation for PR #14643 [ci skip]
2021-04-28 22:16:53 -05:00
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
a331f24121
Automatic changelog compile [ci skip]
2021-04-29 00:06:31 +00:00
85ec8aa5a0
Automatic changelog generation for PR #14666 [ci skip]
2021-04-28 15:56:18 -05:00
8f14424a63
Fixes a couple runtimes in activity tracking ( #14666 )
2021-04-28 22:56:15 +02:00
3afb801036
huh
2021-04-28 15:41:20 -03:00
b19a2cd975
Automatic changelog generation for PR #14641 [ci skip]
2021-04-28 07:09:39 -05:00
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
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
604d5e2fbc
Automatic changelog compile [ci skip]
2021-04-28 00:06:38 +00:00
810eba15ed
Automatic changelog compile [ci skip]
2021-04-27 00:06:17 +00:00
03fa382f36
Update autobunker.dm
2021-04-26 13:57:34 -07:00
3fac51374f
Automatic changelog compile [ci skip]
2021-04-26 00:06:42 +00:00
44c2a9eecd
Automatic changelog generation for PR #14642 [ci skip]
2021-04-25 18:10:11 -05:00
7c1358a39d
Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
...
TGUI Select Equipment menu
2021-04-25 17:10:09 -06:00
e313fed033
hallucinations are capitalized too
2021-04-25 19:04:07 -04:00
cf69e0fb69
Rename emergency_airless.dmm to emergency_construction.dmm ( #14656 )
2021-04-25 12:55:46 +02:00
c2b7140ddd
upload icons.dm
2021-04-24 21:43:12 -03:00
90661d3687
upload files
2021-04-24 21:37:01 -03:00
7cc8e5ea33
Automatic changelog compile [ci skip]
2021-04-25 00:06:57 +00:00
zerothebigboy