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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

359 Commits

Author SHA1 Message Date
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Timothy Teakettle
7b2708b12b Update mind_transfer.dm 2021-09-16 15:42:13 +01:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
keronshb
482b679937 Should fix the linter? 2021-05-27 12:24:16 -04:00
keronshb
8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
keronshb
834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
dzahlus
ca1fe9d6c0 Update shapeshift.dm 
for keb
 2021-03-02 02:40:23 +01:00
dzahlus
f206213603 60 second cooldown instead of 3 minutes 2021-03-01 22:16:23 +01:00
dzahlus
12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
kappa-sama
1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
kappa-sama
656d95ce2f i rewrote this at 2 in the morning 2021-01-12 09:57:36 -05:00
kappa-sama
f98edf0eaa shush 2021-01-12 09:55:18 -05:00
kappa-sama
a58141898c i was tired 2021-01-12 09:45:13 -05:00
kappa-sama
3d9e907532 fixed 2021-01-12 02:19:13 -05:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
DeltaFire
687c6a9e6f and another one 2020-12-28 19:49:42 +01:00
DeltaFire
0bba554052 e 2020-12-28 19:45:03 +01:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
cb36f4ad24 travis we're friends right 2020-09-10 22:50:17 +01:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
silicons
1abe2458ee Update taeclowndo.dm (#13227) 2020-08-23 20:58:34 +02:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
2ec64f3e05 Update wizard.dm 2020-07-20 16:50:56 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00