Commit Graph

139 Commits

Author SHA1 Message Date
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
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
r4d6
37d50e2aaf Add RCD effects
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
2020-01-03 02:13:20 -05:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
kevinz000
a784235e35 scanline 2019-12-16 02:05:52 -07:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Poojawa
c8d7f1909d holy FUCK I got gib overlays working. Why wasn't it before?
No one will ever know.
2019-08-01 00:58:24 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Poojawa
7738c97b80 NYEH. fuckin' memes 2019-06-12 04:33:14 -05:00
Poojawa
26855d0698 Gibs spawn correctly. Just need to figure out the overlays now 2019-06-11 04:33:38 -05:00
Poojawa
69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Poojawa
9f80896280 eh, was going somewhere with this
IPC gibspawner, looking into infinite footprints
2019-05-26 05:36:33 -05:00