a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
82cf7e584b
Update SDQL_2_wrappers.dm ( #11552 )
2020-03-22 13:40:31 +01:00
161a91ec9a
Automatic changelog generation for PR #11559 [ci skip]
2020-03-22 07:37:18 -05:00
0b71b51360
Update stunbaton.dm ( #11559 )
2020-03-22 13:37:16 +01:00
b7e16f296d
Automatic changelog generation for PR #11543 [ci skip]
2020-03-22 07:13:43 -05:00
80baf85300
Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics ( #11543 )
...
* Maps Bumbles in for once
* Hopefully fixes merge conflicts?
2020-03-22 13:13:40 +01:00
f336fe2174
Automatic changelog generation for PR #11564 [ci skip]
2020-03-22 07:12:17 -05:00
71fc6bc693
Fixes bumbles resting ( #11564 )
...
* Fixes bumbles resting
* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update bumbles.dm
* Update bumbles.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-22 13:12:14 +01:00
ee8bbf1165
Automatic changelog generation for PR #11560 [ci skip]
2020-03-22 07:11:40 -05:00
043de9dcd2
Removes the roundstart syringe guns on each map, replacing them with medidart guns. ( #11560 )
...
* nukes roundstart syringe guns for roundstart dart guns.
* fixes the delta and meta maint syringes to have an identical change.
* brings lambda up to date with master.
2020-03-22 13:11:37 +01:00
d3edc2c528
Automatic changelog generation for PR #11549 [ci skip]
2020-03-22 07:02:25 -05:00
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
09cacfa98c
Automatic changelog generation for PR #11561 [ci skip]
2020-03-22 07:01:54 -05:00
5147536eb3
yeah whoops that should go ( #11561 )
2020-03-22 13:01:51 +01:00
203145f528
Automatic changelog generation for PR #11563 [ci skip]
2020-03-22 07:01:39 -05:00
ab1274c832
Massive optimization for sink objective. ( #11563 )
2020-03-22 13:01:36 +01:00
7744e34b79
Automatic changelog generation for PR #11577 [ci skip]
2020-03-22 05:53:21 -05:00
62138878f8
Merge pull request #11577 from dapnee/Lambdastation
...
Minor fixes to Lambda
2020-03-22 03:53:17 -07:00
f530f2f45c
haha
...
bamda is updoot
2020-03-22 04:31:28 -06:00
b1bc595681
Automatic changelog generation for PR #11574 [ci skip]
2020-03-21 21:15:07 -05:00
23882430f6
Various Fixes to Lambdastation ( #11574 )
...
haha imaigne having it right the first time when no one tested it with me
2020-03-22 03:15:04 +01:00
e320ad7830
Various Fixes to Lambdastation
...
haha imaigne having it right the first time when no one tested it with me
2020-03-21 19:12:07 -06:00
f1a21cfbe0
Merge remote-tracking branch 'upstream/master' into Lambdastation
2020-03-21 19:10:10 -06:00
cdb07797b2
Merge remote-tracking branch 'upstream/master' into Lambdastation
2020-03-21 19:09:50 -06:00
cb537f431b
Automatic changelog generation for PR #11565 [ci skip]
2020-03-21 12:30:15 -05:00
c7e634b8c8
Merge pull request #11565 from Citadel-Station-13/Ghommie-patch-1
...
Fixing permanent slapstick comedy creamed overlay.
2020-03-21 10:30:12 -07:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
a924c98f69
Automatic changelog generation for PR #11375 [ci skip]
2020-03-21 10:09:27 -05:00
7c94b555ae
Kills screen-wide EMPs ( #11375 )
...
* Kills screen-wide EMPs
This makes a small line change to make the EMP reaction's size be determined logarithmically, rather than linearly. That meaning, there's diminishing returns on EMPs. As a consequence, there's not TOO much reason to try to make a very big EMP, like with maxcaps (before toxins became research, anyway), though I'm sure some of you, who like to get the largest numbers on things possible, can still reach some ungodly numbers with payloads. You're welcome to reach for new heights, but you shouldn't be able to lolEMP the entire station.
* EMP shrinking 2
2020-03-21 16:09:24 +01:00
94366f7b9b
Automatic changelog generation for PR #11376 [ci skip]
2020-03-21 10:04:28 -05:00
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
84a44e226c
micro optimization for atmos add_to_active/react_queue ( #11508 )
...
* k
* Update code/controllers/subsystem/air.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/controllers/subsystem/air.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/controllers/subsystem/air.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 15:58:18 +01:00
87314b5d4d
Merge pull request #11530 from Ghommie/Ghommie-cit629
...
shapes and sizes sanitized.
2020-03-21 07:32:53 -07:00
92fc94105a
Automatic changelog generation for PR #11548 [ci skip]
2020-03-21 09:32:02 -05:00
94c700a06c
NVG Nerf/Syndicate NVG Buff ( #11548 )
...
* nerfs the shit out of nvg and gives syndicate special flashproof versions
* forgot about this one
* bleh
2020-03-21 15:31:59 +01:00
b183a1ac53
Automatic changelog generation for PR #11545 [ci skip]
2020-03-21 09:07:35 -05:00
2bfc9b8ef8
Gutlunchs now like to eat bodys a bit more! ( #11545 )
...
* Update gutlunch.dm
* hey what if we didnt just port a semi fix...
2020-03-21 15:07:32 +01:00
6c6b2a42eb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629
2020-03-21 15:04:35 +01:00
cf4f7a705d
Update human.dm
2020-03-21 14:52:16 +01:00
9b05fb854c
Automatic changelog generation for PR #11540 [ci skip]
2020-03-21 01:23:29 -05:00
ac4ebfa2b4
Merge pull request #11540 from zeroisthebiggay/uplinkclothinggetssuckies
...
Ports Syndicate Sneaksuits and buffs the paramedic gloves with some other things vaguely relating to armor
2020-03-20 23:23:26 -07:00
6c5160ee5c
i hurt myself today
2020-03-21 02:18:44 -04:00
93b1ade0bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
...
# Conflicts:
# code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
761b4a2152
compile
2020-03-20 23:13:01 -07:00
6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
9c40389e4f
Automatic changelog generation for PR #11529 [ci skip]
2020-03-21 00:57:46 -05:00
d1da7c8131
Merge pull request #11529 from Trilbyspaceclone/patch-312
...
Small pipes
2020-03-20 22:57:43 -07:00
cc8d8da0fe
Merge pull request #11531 from Ghommie/Ghommie-cit630
...
Removing some egg-celent unused preferences.
2020-03-20 22:56:19 -07:00
83c5e09aeb
Automatic changelog generation for PR #11537 [ci skip]
2020-03-21 00:54:31 -05:00
8a8b6efb39
Merge pull request #11537 from Trilbyspaceclone/patch-317
...
Badass Glasses
2020-03-20 22:54:28 -07:00
kevinz000