shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,054 Commits 5 Branches 0 Tags
ebf8d048fde27e8d34342ad753e2b68942fe741b
Commit Graph

3659 Commits

Author SHA1 Message Date
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
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 
Unmodularize several machinery and structures
 2020-01-07 00:31:24 +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
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
Ghom
07a5f052d3 Merge pull request #10400 from chefferz/chefferz-toiletshuttle 
Gives ability to buckle yourself to a toilet
 2020-01-04 14:25:54 +01:00
Ghom
3086b5eb38 boolean 2020-01-04 14:19:15 +01: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
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Linzolle
d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
kevinz000
d1d9b7a179 Merge pull request #10403 from r4d6/patch-1 
Add a way to make opaque plastic flaps
 2020-01-03 08:16:17 -08:00
kevinz000
04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
BlackMajor
a4d2ea0281 Small fix 2020-01-03 22:39:58 +13:00
Putnam
adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
BlackMajor
08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d Sync 2020-01-02 22:02:55 +13:00
r4d6
6e5d04ff1f Adding a way to make opaque plastic flaps 2020-01-02 02:52:48 -05:00
chefferz
46feaf9663 Update watercloset.dm 2020-01-02 01:09:29 -05:00
kevinz000
e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260 
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
 2020-01-01 22:07:18 -08:00
nik707
be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields 
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
 2020-01-01 20:28:15 -06:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat
ef36b9df75 i love democracy 2019-12-31 21:44:03 -06:00
kevinz000
1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts 
Ghost Cafe patrons now spawn with chameleon kits
 2019-12-31 19:28:55 -08:00
CameronWoof
58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy 2019-12-31 17:44:18 -08:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Ghom
cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker 
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
 2019-12-31 18:01:23 +01:00
KathrinBailey
243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey
0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey
f2e9ba2a8e Makes lockers into subtypes 
Adds new lockers cleanly at the bottom instead and as subtypes.
 2019-12-31 16:41:23 +00:00