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 2026-01-29 18:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,712 Commits 55 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

746 Commits

Author SHA1 Message Date
necromanceranne
af6df2784c holy shit this was still in the fucking game 2020-02-20 04:46:30 +11:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
kevinz000
d74cfb7734 Update compressionkit.dm 2020-02-13 02:22:25 -07:00
kevinz000
40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00
kevinz000
276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000
690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000
98c721fffc Update cart.dm 2020-02-05 13:29:31 -07:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08: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
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Ghom
ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08: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
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000
e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
Ghom
7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000
4376434e01 woops 2020-01-24 22:31:05 -07:00
kevinz000
b33e6cd79e scanner fix 2020-01-24 22:00:03 -07:00
kevinz000
ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517 
neuter/plural gender fixes.
 2020-01-24 16:15:44 -07:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Ghommie
856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghommie
c69032ff42 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-24 18:56:27 +01:00
Seris02
90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
Ghommie
7d5725e450 a dot 2020-01-24 02:31:46 +01:00
Ghommie
78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
c2bcbe868e merge conflicts + getting rid of commented code for now 2020-01-21 11:23:33 +08:00
kevinz000
41191c3974 trauma 2020-01-20 19:01:11 -07:00
Ghom
c244f95ed9 Merge pull request #10588 from PersianXerxes/tweakEngieField 
Reduces Forcefield Projector Range to Two Tiles
 2020-01-21 02:17:38 +01:00
kevinz000
5abc1104c0 ok 2020-01-20 18:03:54 -07:00
kevinz000
221e05b3c8 add line 2020-01-20 17:58:58 -07:00
kevinz000
bb14b255d2 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12 2020-01-20 17:51:56 -07:00
kevinz000
0661bc2558 Update PDA.dm 2020-01-20 15:26:24 -07: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
kevinz000
051ca8c050 checks 2020-01-20 03:45:40 -07:00