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
40,620 Commits 55 Branches 0 Tags
bbd3fd54ba3b8b0921b87973c17a9580bdc8a0f3
Commit Graph

177 Commits

Author SHA1 Message Date
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Hatterhat
a8f1960c5b disregard the branch name 2020-12-27 01:14:12 -06:00
The0bserver
4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
The0bserver
5e9e984fd0 a few more crumbs we missed. Travis might be happy now. 2020-11-20 18:45:32 -05:00
The0bserver
56b6a42bb8 Tweaks, making sure code is right. Pain is infinite. 
Tin
 2020-11-20 03:54:28 -05:00
The0bserver
6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Detective Google
8167f047f9 Update snow_taxi.dmm 2020-10-17 19:29:13 -05: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
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -05:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Sishen
3a8675048a Update whiteship_box.dmm 2020-08-07 21:16:52 -06:00
Sishen
2d53eceb86 Update whiteship_box.dmm 2020-08-06 12:31:04 -06:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -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
Detective Google
57fca41e20 aeugh2 2020-06-25 15:22:11 -05:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Trilbyspaceclone
51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Timothy Teakettle
2d1d2eeda6 final fixes 2020-06-16 23:47:22 +01:00
Timothy Teakettle
779e15f3b5 map fixes 2020-06-16 17:16:31 +01:00
Timothy Teakettle
d10dfbec5e fix maps but it works 2020-06-16 16:23:53 +01:00
timothyteakettle
b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
TrilbySpaceClone
b62ef0f4e8 right... 2020-06-02 19:44:47 -04:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 
Adds a New map, Snow Taxi (A vgstation13 map port)
 2020-06-02 23:48:50 +02:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Detective Google
7cb79695c5 first round of testing fixes 2020-05-11 21:04:46 -05:00
Detective Google
424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Detective Google
8f44cf1305 PR TIME WOOO 2020-05-09 00:59:40 -05:00
Detective Google
9f25759aa8 Citsnow -> final name (Snaxi) , fixes arrivals 2020-05-09 00:53:04 -05: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
Detective Google
bad9e76e50 Fixes pirates, ops, the mining base, and gives pirates and ops drills 2020-05-03 00:28:28 -05:00
TrilbySpaceClone
655497be89 why didnt these save? 2020-04-25 18:17:38 -04:00
TrilbySpaceClone
5637ba3b53 more decal delettion 2020-04-25 18:12:09 -04:00
TrilbySpaceClone
a3379089a6 Decal delete 2020-04-24 11:26:21 -04: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
Kraseo
a8759b048e smashes the tyranny of public mining 2020-03-31 23:32:15 +02:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
EmeraldSundisk
0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundisk
4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00