Commit Graph

1548 Commits

Author SHA1 Message Date
zerothebigboy
40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
timothyteakettle
b94267e1e1 more spellchecks 2020-06-27 02:41:50 +01:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Trilbyspaceclone
916a1ab349 Update objective_items.dm (#12420) 2020-06-02 23:37:05 +02:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280)
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
2020-05-17 16:35:17 -07:00
Putnam3145
e1d113b970 Config for antag forcing (#12171) 2020-05-10 21:35:20 +02:00
Putnam3145
602154abe8 Fixes cloner sabotage to only check on station Z (#12140) 2020-05-08 15:48:23 +02: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
Putnam3145
0019b5a742 Game info verb for ghosts (#11935)
* Some ghost QoL stuff

* DNR/observer only
2020-05-01 18:02:00 +02:00
kevinz000
830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
2020-04-29 12:02:21 -07:00
Putnam
00c2ddce8f Actually this is better 2020-04-25 23:18:37 -07:00
Putnam
3da4701dff Switch roundstart thing to initial. 2020-04-25 23:06:15 -07:00
Putnam
257de9d4c9 Adds uplinks back to nukies. 2020-04-25 19:22:55 -07:00
Putnam
d7c0834794 A couple important comments. 2020-04-25 17:22:12 -07:00
Putnam
b9e88f85bb Allowed better admeme stuff for dynamic 2020-04-25 17:15:17 -07:00
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
Putnam
17f6099013 new clamp 2020-04-24 16:18:34 -07:00
Putnam
95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam
54820f0ecb Made midround/latejoin come faster if no roundstarts 2020-04-21 21:54:28 -07:00
Putnam
1bd3d4ceab Some storyteller tweaks. 2020-04-21 21:50:51 -07:00
Putnam
e70eb60d95 Nono, it's the MOB that voluntary ghosts. 2020-04-21 21:33:19 -07:00
Putnam
2ac9c70763 Makes storyteller changing actually work. 2020-04-21 21:33:03 -07:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
kevinz000
791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
2020-04-20 11:43:37 -07:00
Ghom
86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
DeltaFire
dcd112c379 Hm yes maybe no ratting out would be nice
What it says on the tin.
2020-04-17 13:34:34 +02:00
Putnam
87dd2681ca The locate isn't necessary 2020-04-16 08:30:55 -07:00
Putnam
368d801940 Makes objectives clean theirselves up properly. 2020-04-16 08:17:48 -07:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghom
d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2
More dynamic tweaks + dynamic latejoin changelings
2020-04-13 01:48:12 +02:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
2020-04-12 20:47:19 +02:00