cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,117 Commits 55 Branches 0 Tags
bfdef7fcfd2f552bbeac08bf63d0d35fcea655cf
Commit Graph

541 Commits

Author SHA1 Message Date
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain 
small refactor to melee_attack_chain
 2020-02-13 09:39:07 +01:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
kevinz000
01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Putnam3145
33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
Hatterhat
41a3dc64d5 what 2020-01-29 16:44:01 -06:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Artur
8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Hatterhat
9b9c7c3018 exo nerf 2020-01-19 20:37:31 -06:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
r4d6
0d3706b7f9 Make public shuttle not require access 2020-01-17 22:15:29 -05:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
r4d6
ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Artur
bede695ebd Undoes minter changes 2020-01-15 09:49:57 +02:00
Artur
d04c09aba0 Compiles, just need to fix goonchat 2020-01-15 09:44:03 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +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
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06: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
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks 
[READY] Bloodsucker tweaks
 2020-01-08 13:36:24 -08:00
Artur
e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01: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
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01: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
BlackMajor
8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
Hatterhat
ff8a86d05a squashing is hell but orm lasers work 2019-12-30 23:50:49 -06:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
BlackMajor
c14a639f6e crusher wasn't dealing damage whoops 2019-12-30 12:25:12 +13:00
BlackMajor
b811d3e57e More work on it 2019-12-30 01:23:41 +13:00