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
35,341 Commits 55 Branches 0 Tags
6943462acc089433f6e1ea8d948703d8f6ae11da
Commit Graph

260 Commits

Author SHA1 Message Date
timothyteakettle
6943462acc changes 2020-07-18 02:41:30 +01:00
Letter N
c2e4ff8bb8 we don't have title0 2020-07-12 20:06:12 +08:00
Letter N
51f1d86c80 Create license.txt 2020-07-12 13:25:14 +08:00
Letter N
2253c51382 was lowercase 2020-07-12 13:22:46 +08:00
Letter N
8867a039c5 Legal© Shenanigans™ 2020-07-12 13:21:16 +08:00
Lin
1966c6daca Merge pull request #12595 from silicons/squish 
*squish
 2020-06-29 13:11:38 -05:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons
800825f9f7 squish 2020-06-24 11:02:47 -07:00
Timothy Teakettle
1c2366cc3d update files to tgs 2020-06-14 18:16:01 +01:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kevinz000
05068f80db Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-07 10:57:10 -07:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) 
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-05-07 14:46:16 +02:00
kevinz000
f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Putnam3145
3fc4416680 Buffs medbots massively. (#12058) 
* Buffs medbots massively.

* Reverted the previous buff slightly.

* Update code/modules/mob/living/simple_animal/bot/medbot.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-01 18:50:22 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
kevinz000
320c33e375 Vore compression 2020-04-18 01:46:59 -07:00
kevinz000
18b9d1cc16 Sound compression 2020-04-18 01:39:50 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Auris456852
03f583e5ff Adds admin printer noise for Centcomm/Syndicate messages 2020-04-10 18:50:52 +03:00
kevinz000
7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix 
TGUI Next vendors plus spritesheet port from TG
 2020-04-09 03:53:08 -07:00
kevinz000
3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-04-08 04:04:45 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03:00
kevinz000
31c5996a5d sound effects + block pixelshift visuals 2020-03-27 21:10:02 -07:00
kevinz000
e6fd72e5eb k 2020-03-26 14:54:49 -07:00
kevinz000
afda58dbf6 sounds1 2020-03-26 14:50:03 -07:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Kraseo
ab1c62f9ac SIGH 2020-03-02 00:02:48 +01:00
Kraseo
7206e5ee6e nearly forgot these as well 2020-03-01 23:31:14 +01:00
Kraseo
e3034720c6 forgot to add these lol 2020-03-01 22:08:11 +01:00
Ragolution
b5fd1c7f59 THAT wasn't in the blueprints. 
How the fuck is it an .ogg video file lmao

Amended and heavily reduced file size.
 2020-02-29 02:13:46 -05:00
Ragolution
46cf180542 Adds new audio file for round-end. 
Preview: https://voca.ro/69CKa9ZbQE8
 2020-02-29 01:05:46 -05:00
Ghom
954f03f4e0 Merge pull request #11150 from raspyosu/master 
Bloodsucker Abilities Tweaks/Rebalances
 2020-02-27 00:54:41 +01:00
kevinz000
59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
raspyosu
28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
Ghom
e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01:00
raspyosu
9803a0835c lunge tweaks 
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
 2020-02-18 19:04:20 -05:00
kevinz000
d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
Linzolle
4622f66162 for real this time 2020-02-09 19:45:22 -06:00
Detective Google
f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
kevinz000
f3d955f397 Merge branch 'master' into staves 2020-02-04 14:54:35 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
Artur
54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00
kevinz000
9cf02ac96f moth sounds 2020-01-28 17:36:10 -07:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00