163 Commits

Author SHA1 Message Date
SandPoot 003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
SandPoot 387b4b236c push 2024-01-07 00:37:16 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot d53c010745 gone 2023-01-28 15:47:18 -03:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
Darius 4bea655c8b Port Furry Pride graffiti
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05:00
silicons a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -07:00
shellspeed1 236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
SandPoot 09e351277a this 2022-07-03 01:28:39 -03:00
Putnam3145 a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
silicons 4632c85d71 silly proof of concept item (#15456)
* should have listened to putnam

* why am i doing this

* that

* lmao

* more

* it compiles

* it compiles

* fixes

* FUNNY GLOW SWORD

* more..

* unterminated text

* wthat wasn't working

* it's coming together

* woo

* what have i done

* fin.

* eh
2022-02-11 21:04:21 -08:00
Lin efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
DrPainis 4661066261 adds the new blood file
the PR actually does what the title says now
2021-10-23 02:11:24 -04:00
DrPainis 07640c82cd deletes the blood file to fork the repository since I am going to put it back anyways 2021-10-23 02:09:03 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
Artur 724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons 716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
silicons 3c42247870 fix 2021-05-26 20:19:47 -07:00
necromanceranne c819879473 Changes the space adaptation sprite to something more subtle. 2021-04-23 12:06:24 +10:00
keronshb 475a7d2499 Icon fixes
Should fix the merge conflict
2021-04-14 18:01:17 -04:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Timothy Teakettle 5ebdb6deec yes 2021-02-09 09:37:17 +00:00
kiwedespars a7d68281a3 new changes
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
Putnam3145 23b4ba3714 Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons 0668941669 fix 2020-08-07 07:19:41 -07:00
silicons 891afed687 hoh 2020-08-07 06:27:49 -07:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Detective Google 0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Ghom ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07: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
kevinz000 7d17da1bac stuff 2020-04-28 23:51:49 -07:00
kevinz000 f3537f38e6 shield bashing 2020-04-11 07:09:50 -07:00
Ghommie b453a25e14 Something about banana pies, runtime errors and warnings. 2020-03-15 15:41:32 +01:00
Seris02 c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Detective Google f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
Hatterhat e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
kevinz000 5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-19 20:25:51 -07:00
Seris02 718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
kevinz000 4f665930cc a a 2020-01-15 19:32:38 -07:00
kevinz000 c5b95ff5d0 Mapping helpers 2020-01-15 18:22:43 -07:00
Seris02 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
Detective Google f6c5f81a83 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-12 15:16:17 -06:00
Detective Google d5b227a0ca adds the POOL to box station
F in chat for dorms 7.
2020-01-11 23:34:07 -06:00