Commit Graph
179 Commits
Author SHA1 Message Date
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Enric Gabriel 06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
Detective Google 81f7307575 yeah 2020-08-14 15:38:27 -05:00
TrilbyspacecloneandGitHub 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03: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
TrilbyspacecloneandGitHub e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Enric Gabriel dd6286495a big brain time 2020-07-22 15:15:07 -03:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
siliconsandGitHub 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
crazyraio2 1c0185381c more fans 2020-07-17 07:37:57 -03:00
crazyraio2 a4d1e716b3 rooms and rooms 2020-07-15 11:25:36 -03:00
crazyraio2 232c39d1e4 stuff 2020-07-11 19:17:03 -03:00
crazyraio2 08108cb1fe yeah boi, power. 2020-07-08 19:04:21 -03:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
crazyraio2 895e839995 good shuttle, yay 2020-07-04 15:36:36 -03:00
Enric Gabriel a62d78cd03 yeets something old away 2020-07-04 14:13:08 -03:00
Enric GabrielandGitHub 04445eaf3c [READY] New map (#13)
* some stuff for shuttle
* yay, an unoriginal map
looks like i'm the one responsible for it
* moves them to a path that game finds it
* requested changes
* some changes to fix shuttles
* more shuttle fixes
* almost done with it
* mapmerger
* making travis hate us less?
* permabrig shuttle
* more stuff
* thought it was abandoned
* renames it to the right name
* well, i guess we're testing
* almost finished with it, give me pizza
* who ya gonna call ?
the police, let me out of this basement
* forgot this one
* please, tell me that's how you connect them
* maybe the shuttle works now ?
* Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map"
This reverts commit 1941a64e28, reversing
changes made to fda6afe660.
* Revert "maybe the shuttle works now ?"
This reverts commit fda6afe660.
* Revert "Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map""
This reverts commit fbae802dd3.
* jeez, why did i make so many shuttles
i'm lazy
* google
how do i modify the changelog
* another one bites the dust
* is it finally done ?
* do we need viro ?
* IT ISN'T OVER!!
* this isn't the last one, apparently
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com> *actually mainly done by them*
2020-07-03 15:46:15 -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
kevinz000andGitHub 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
TrilbyspacecloneandGitHub 51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
SmArtKarandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
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
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