03d87f6bdc
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-29 20:44:49 -07:00
0cee7c9675
Merge pull request #11660 from deathride58/fuckcontractors
...
Quick and dirty PR to make contractor targets actually show up in the traitor panel
2020-03-29 20:42:43 -07:00
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
b6202ad5a5
Gives shutters glass so the close proc doesn't change opacity
2020-03-30 02:36:27 +01:00
0bb93c3fa6
Ports "I got high and made a thing that was broke and 3 years, 2 months, 17 days later I get high and fix it."
2020-03-29 19:20:30 +02:00
98eff75e9f
Objects.
2020-03-29 18:57:48 +02:00
d1d090ae6f
adds a length check for if the assigned targets list spontaneously deletes itself
2020-03-29 11:54:49 -04:00
a4313ee101
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink ( #11675 )
2020-03-29 17:45:01 +02:00
aa01c30656
Removes some weapons and crates that shouldn't have been added, like, ever ( #11673 )
2020-03-29 17:22:03 +02:00
cd9a782d9f
Double-barreled shotgun and their children now can be used with off-hand weapons ( #11674 )
2020-03-29 17:20:39 +02:00
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot ( #11671 )
2020-03-29 17:19:27 +02:00
3ddfbe0e29
Null Crate removal ( #11672 )
2020-03-29 17:16:58 +02:00
49416886a1
Update turf.dm ( #11679 )
2020-03-29 17:09:26 +02:00
5e5bc2a690
force push.
2020-03-29 17:01:05 +02:00
c6163e2349
this time it will work, right?
2020-03-29 15:02:36 +01:00
32b8af693d
Makes AI-hacked-law sabotage only run if there's AI
2020-03-29 06:52:44 -07:00
569d7aac6f
Removes integrity sabotage
2020-03-29 06:52:21 -07:00
304b2c68bf
Finished, after a way too long break!
2020-03-29 09:36:40 -04:00
a68ce82060
woops
2020-03-29 14:13:16 +01:00
4eb2fb531a
Update sword_point.dm ( #11678 )
2020-03-29 15:03:08 +02:00
0bc6a3d4b6
Updating
...
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
2020-03-29 08:35:15 -04:00
ff9f77eb8c
uuh whatever
2020-03-28 23:57:15 -07:00
abde27c098
layer changes
2020-03-28 23:50:08 -07:00
f419653c28
functionality
2020-03-28 23:50:06 -07:00
c9484e7db2
Revert "Delete split_personality.dm"
...
This reverts commit f9ba031525
2020-03-28 20:10:24 -07:00
f9ba031525
Delete split_personality.dm
2020-03-28 20:00:16 -07:00
659873979f
Merge pull request #11656 from Xantholne/bumbleswakeup
...
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
2020-03-29 02:06:09 +00:00
942034df51
Makes a few space ruins hard spawn ( #11606 )
...
* Update space.dm
* off with the sawed-in-half ruin
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-29 03:53:31 +02:00
b89a6b0398
makes everything work
2020-03-29 02:44:44 +01:00
5afe5aab3f
fixes the map, adds subtype of martial art
2020-03-29 00:46:18 +00:00
46e5a18bd3
Update door_assembly.dm
2020-03-29 01:03:08 +01:00
1ab929c7c9
fixing no grav limbless slowdown
2020-03-29 00:58:33 +01:00
983d7826b6
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
2020-03-29 00:51:16 +01:00
9595df3e18
Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny
...
ports tg holoparasite customizations
2020-03-28 16:02:08 -07:00
6cafca3f9f
Merge pull request #11652 from Ghommie/Ghommie-cit650
...
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
0aebf68df0
Merge pull request #11651 from zeroisthebiggay/donotreviveme
...
ghosts can now DNR
2020-03-28 16:00:08 -07:00
9797089f0c
Merge pull request #11650 from Ghommie/Ghommie-cit649
...
Ports "Adds spam prevention to clients"
2020-03-28 15:59:40 -07:00
015371800c
Merge pull request #11649 from Ghommie/Ghommie-cit648
...
infiltrator sneaky boots fix.
2020-03-28 15:59:10 -07:00
dd90d21f93
Merge pull request #11645 from Trilbyspaceclone/vaild
...
Et tu?
2020-03-28 15:58:56 -07:00
cf24117c77
Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1
...
Makes Envy knife amongst other dna disguise shenanigeans actually update the gender.
2020-03-28 15:58:29 -07:00
938ad42735
Merge pull request #11636 from Trilbyspaceclone/patch-325
...
Medical Mechs syringe gun now innately know more healing chems
2020-03-28 15:58:14 -07:00
b51dd7dc70
make the new holodeck an option
2020-03-28 22:24:47 +00:00
8a620b0ebc
More dynamic rework: help I wasn't done ( #11642 )
...
* Starting a replacement of how threat works.
* no, we do it this way
* Added threat levels to jobs
* Added threat to... a lot.
* Updated for traitor classes.
* Fixed errors, except for one.
It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.
* Added type annotation to GetJob.
* This one I should change though
* wow how'd that happen
* spammable means low threat
* Made story threat have initial threat level on average
* Made somet rulesets force if they won the vote
* )
* Gave EVERY job threat, added a config for it.
* Rebalanced some numbers
* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Removes mush threat
* Makes devil threat scale with form
* reviewing reviewer's review of reviewer
* Gutlunches can be friendly spawned, so no
* Also made forced-friendly mobs not count
* null checks better
* Made antag threats in config, too
* various fixes
* Another couple dynamic fixes
* Made an admin message chunk all one line.
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-28 14:46:37 +01:00
c39dd52b5f
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-27 21:32:40 -07:00
0d35033736
Update twohanded.dm
2020-03-27 21:28:45 -07:00
354ca22c9a
Makes contractor targets actually show up in the traitor panel
2020-03-28 00:28:44 -04:00
eb84d426e1
Merge pull request #11634 from Ghommie/Ghommie-cit645
...
Fixing a couple issues with sofas.
2020-03-27 21:25:31 -07:00
39e2ae7d1f
Merge pull request #11629 from Seris02/nomoreblowingborgs
...
stops hijackers from being able to remotely blow up borgs (probably)
2020-03-27 21:23:54 -07:00
31c5996a5d
sound effects + block pixelshift visuals
2020-03-27 21:10:02 -07:00
a85d590b1d
Update bumbles.dm
2020-03-28 03:35:12 +01:00
kevinz000