 kappa-sama
|
5eb08e25c2
|
Merge pull request #32 from kappa-sama/moredular
i wanna kill myself
|
2020-01-11 12:35:59 -05:00 |
|
|
kappa-sama
|
8a7e6d49a6
|
e
|
2020-01-11 12:35:49 -05:00 |
|
|
kappa-sama
|
eb93e3d1d3
|
hi
|
2020-01-11 12:35:04 -05:00 |
|
|
kappa-sama
|
108e585cf1
|
shit
|
2020-01-11 12:25:38 -05:00 |
|
|
kappa-sama
|
1aee5e880a
|
god
|
2020-01-11 12:24:23 -05:00 |
|
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|
|
Ghom
|
c2b3e7b0ec
|
Merge pull request #10505 from LetterN/beep-boom
better electropack ui
|
2020-01-11 15:21:08 +01:00 |
|
|
Ghom
|
1f9a7066f0
|
Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7
Grey Tide spear is now vareditable
|
2020-01-11 15:10:16 +01:00 |
|
|
Ghom
|
e12f5e9e44
|
Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
|
2020-01-11 15:07:55 +01:00 |
|
|
kappa-sama
|
b6a187dc6d
|
OOPS
|
2020-01-10 22:48:33 -05:00 |
|
|
kappa-sama
|
bfedc80c64
|
idk what this even is lmao
|
2020-01-10 22:39:45 -05:00 |
|
|
kappa-sama
|
f88eefa8a9
|
stunsword
|
2020-01-10 22:30:28 -05:00 |
|
|
kappa-sama
|
e21cb4e67b
|
shocking
|
2020-01-10 22:28:55 -05:00 |
|
|
kappa-sama
|
aacf4bec8b
|
qm set
|
2020-01-10 22:26:48 -05:00 |
|
|
kappa-sama
|
62ebc2d226
|
zoom
|
2020-01-10 22:25:07 -05:00 |
|
|
kappa-sama
|
e5e58518e4
|
boomers
|
2020-01-10 22:22:44 -05:00 |
|
|
kappa-sama
|
412b0175b6
|
new file
|
2020-01-10 22:20:53 -05:00 |
|
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
|
kevinz000
|
9cec806875
|
Update scanners.dm
|
2020-01-10 12:48:55 -08:00 |
|
|
kevinz000
|
7392760f38
|
Update scanners.dm
|
2020-01-10 12:48:19 -08:00 |
|
|
Letter N
|
6ec3fde836
|
better-signalers
|
2020-01-10 18:06:55 +08:00 |
|
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
kappa-sama
|
35353996bd
|
lazy copypaste
|
2020-01-08 16:36:53 -05:00 |
|
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
|
Lin
|
c162e9bb5d
|
Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
|
2020-01-07 19:37:49 +00:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
|
Ghommie
|
4cc0833b28
|
Fixing an edge case runtime with ore bags.
|
2020-01-06 01:45:53 +01:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
kevinz000
|
0f909a1437
|
Update twohanded.dm
|
2020-01-05 12:50:51 -08:00 |
|
|
kevinz000
|
4d151b2a7c
|
Update twohanded.dm
|
2020-01-05 11:20:13 -08:00 |
|
|
kevinz000
|
46cf029a28
|
Update twohanded.dm
|
2020-01-05 11:19:18 -08:00 |
|
|
Ghom
|
516ec585d2
|
Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
|
2020-01-05 16:22:44 +01:00 |
|
|
Ghom
|
eeb9ec5f35
|
Merge pull request #10380 from Hatterhat/tg-43000-powerfists
powerfists throw people faster but also leak their gas into the air
|
2020-01-05 15:12:06 +01:00 |
|
|
Hatterhat
|
f166586ca0
|
a comma
|
2020-01-04 21:05:55 -06:00 |
|
|
Hatterhat
|
5b0d20cf37
|
this one fucking tab
|
2020-01-04 19:52:01 -06:00 |
|
|
Hatterhat
|
46ced736ba
|
what the fuck was that damage my guy
|
2020-01-04 19:51:06 -06:00 |
|
|
Hatterhat
|
92f6fe129a
|
tgstation 40394 port
|
2020-01-04 07:14:39 -06:00 |
|
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghom
|
39da7cc58e
|
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
|
2020-01-04 14:03:01 +01:00 |
|
|
Hatterhat
|
5142a0e4ae
|
that should probably be there
|
2020-01-04 02:07:19 -06:00 |
|
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|