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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,806 Commits 55 Branches 0 Tags
a5e9ae8bc6966ac7461f34e7205639cfd3a1b8cb
Commit Graph

246 Commits

Author SHA1 Message Date
zerothebigboy
a3deabf4af a 2020-08-13 23:48:46 -04:00
zerothebigboy
0e2f561c92 a 2020-08-13 23:35:03 -04:00
zerothebigboy
a301c2238b a 2020-08-13 23:24:37 -04:00
ancientpower
b917280956 adds a lobby track 2020-08-12 21:43:42 -05:00
silicons
0ff1d152a1 Update traumas.json (#13050) 2020-08-09 15:47:23 +02:00
silicons
70c22d55af Merge pull request #13051 from kappa-sama/patch-38 
juice spilled
 2020-08-09 05:43:59 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
dafa444240 Merge pull request #13041 from Ludox235/more-abductee-shit 
No murderbone please
 2020-08-06 19:35:31 -07:00
kappa-sama
905710b0be worth 2020-08-06 20:58:11 -04:00
Ludox
d4f76917e4 No murderbone please 2020-08-06 02:52:29 +02:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Ludox
401d7b14b5 Get that shit off my screen 
Who tought this was a good idea for fuck sake
 2020-07-21 10:18:39 +02:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ragolution
2739937a44 By request and by request only. 2020-06-26 15:09:19 -04:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Trilbyspaceclone
02f467654e Adds a few more usefull tips (#12266) 
* Update tips.txt

* Update tips.txt
 2020-05-24 13:05:47 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Trilbyspaceclone
fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112) 
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
 2020-05-20 19:03:20 -07:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam3145
e36bd50ad9 Makes G gluid calcs only happen when it's required (#12095) 
* Made G fluid calcs only happen on moment it's required.

* whoops

* Update modular_citadel/code/modules/arousal/organs/testicles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-04 05:08:01 +02:00
TrilbySpaceClone
1740531432 it just complies 2020-04-25 23:23:42 -04:00
Artur
f97f264fb7 Fixing more stuff 
Mint machine compile fixes and the syndicate contractor program.
 2020-04-23 20:09:42 +03:00
Putnam3145
d60174f585 Merge pull request #11881 from Ghommie/Ghommie-cit684 
Removed that one ss13 slur the code.
 2020-04-16 08:29:10 -07:00
Ghom
13def914b6 Update phobia.json 2020-04-16 17:18:11 +02:00
Ghom
894579b068 indention 2020-04-16 17:17:15 +02:00
Ghommie
109a69d301 Removed that one infamous ss13 slur the code. 2020-04-16 16:58:36 +02:00
Linzolle
39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Putnam
36e37feae8 Removed some bad flavor objectives. 2020-03-04 11:23:53 -08:00
Detective Google
141bd96430 man FUCK psychs 2020-02-20 22:46:37 -06:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghommie
7362b89aeb More stuff. 2020-02-07 08:04:07 +01:00
Putnam
37777c4cc7 Removed the wirecutting one 2020-01-25 13:37:40 -08:00
Putnam
847b3c0a09 Fixed flavor objectives and added more. 2020-01-24 10:46:07 -08:00
Trilbyspaceclone
bc1e24cb7b Update tips.txt 2020-01-14 08:40:58 -05:00
Trilbyspaceclone
c320143d53 Update tips.txt 2020-01-14 08:39:24 -05:00
TrilbySpaceClone
29e7c49627 Pss got any of the good stuf Hydro? 2020-01-11 13:07:02 -05:00
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
kevinz000
45e91e7943 Merge pull request #9544 from MrJWhit/brain-damage-change 
Changes brain damage lines
 2019-11-14 15:49:59 -07:00
MrJWhit
412aa0feeb Update traumas.json 2019-10-21 20:33:28 -04:00
MrJWhit
142144ebad Update traumas.json 2019-10-20 23:31:35 -04:00
MrJWhit
6fb205c17b Update traumas.json 2019-10-20 22:17:50 -04:00
MrJWhit
7e8101abc3 Changes brain damage lines 
Adds the noise emotes, as well as makes the brain damage not lean towards OOC in IC language.
 2019-10-20 03:30:18 -04:00
JTGSZ
9cac961ba3 Halloween lava dwarves 2019-10-14 10:27:09 -04:00
Fermi
5764041835 Adds new title music! 2019-08-08 17:25:40 +01:00
kevinz000
e7eda42260 Merge pull request #8876 from Poojawa/patch-1 
So I was trying to talk to someone with brain damage today
 2019-07-14 03:34:05 -07:00