8610c7f664
better inhands
2020-02-19 19:10:19 -07:00
b66b8ac2a0
Merge remote-tracking branch 'citadel/master' into staves
2020-02-19 14:32:28 -07:00
304026a4f8
Merge pull request #11151 from Putnam3145/map-irv-fix
...
Fixed map vote type config
2020-02-19 21:13:48 +01:00
dd3520896a
wow there's an else
2020-02-19 11:45:37 -08:00
6aec971b4e
haha i'm dumb
2020-02-18 21:41:00 -08:00
479cdccd17
Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11
...
The game's BUILT IN AUTOCLICKER no longer triggers the autoclicker detection system
2020-02-19 02:12:42 +01:00
0619521418
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
...
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
4d39bae16b
Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb
...
Clarifies comments and locks defusal kits behind an emag
2020-02-19 02:09:02 +01:00
77d5c09858
Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7
...
Bandaids a projectile runtime, removes an unused variable
2020-02-19 02:05:49 +01:00
2b7f27270f
Merge pull request #11083 from Hatterhat/sword-cleaning
...
purifying longswords - alt title "there's no way this should have worked"
2020-02-18 19:02:34 +01:00
08c86ec1ea
Merge pull request #11091 from BlueWildrose/master
...
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
6ea2843149
Merge pull request #11131 from Seris02/demondabbing
...
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
2020-02-18 17:02:17 +01:00
49cef552a0
cleaner
2020-02-18 02:27:38 -07:00
43db506161
stopa ccidently recycling this
2020-02-18 02:26:05 -07:00
8666a36b1e
fixes most things
2020-02-18 02:24:31 -07:00
d04126226b
Merge pull request #11082 from Hatterhat/preservahyde
...
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
9280e25703
Merge pull request #11087 from Ghommie/Ghommie-cit579
...
Fix for solar panels/trackers being wonky.
2020-02-18 02:21:16 -07:00
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
ed36aae74b
Merge pull request #11112 from necromanceranne/mech-revival
...
Mech Stuff: Ports /tg/ pr #44529 , reverts #9092 (mostly)
2020-02-18 02:18:57 -07:00
c1df5d5313
Merge pull request #11111 from Ghommie/Ghommie-cit582
...
Virology support for synthetic blood and some blood subtypes removal.
2020-02-18 02:18:03 -07:00
918618831c
Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3
...
Something about gibs and mob biotypes.
2020-02-18 02:17:32 -07:00
84633e7fe4
Merge pull request #11104 from Trilbyspaceclone/patch-288
...
Maybe makes Express console log their buying habits
2020-02-18 02:13:53 -07:00
43b9875bbd
Merge pull request #11119 from Ghommie/Ghommie-cit584
...
Something about consistency and magnetic rifles.
2020-02-18 02:12:51 -07:00
9dbc6ca183
Update client_procs.dm
2020-02-17 22:37:58 -07:00
139508a9a4
Update drag_drop.dm
2020-02-17 22:36:57 -07:00
cfca197fbb
forgot one last change that I made out of frustration because making things bald wasn't working for some reason
2020-02-17 19:55:32 -07:00
930e6f9876
Requested changes, ghost_role_spawner.dm
2020-02-17 19:47:48 -07:00
78fcd706b3
Requested changes, podpeople.dm
2020-02-17 19:41:30 -07:00
8f653b4dd6
Update materials.dm
2020-02-17 15:48:31 -05:00
3b82e34db6
Update code/modules/cargo/packs/emergency.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-17 15:48:02 -05:00
b9b7e27bcb
Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
...
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
217661184d
nerf'd
2020-02-17 21:29:34 +08:00
a2583f5f7f
Update expressconsole.dm
2020-02-17 14:25:50 +01:00
5c60994572
Merge pull request #11108 from Seris02/hslshit
...
makes spraycans rely on HSL lightness instead of an addition of all the RGB values
2020-02-17 13:45:23 +01:00
ffe1c794eb
Changes cult stunhand when halos are out ( #11053 )
...
* Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
* Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
* Requested changes
Requested changes
2020-02-17 13:29:51 +01:00
b271096b77
rest key, v, version two ( #11090 )
...
* maybe
* skreeeee
* yes
* fucccccccccck
* happy now
* Update interface.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-17 12:47:19 +01:00
66d5e0e346
Update station.dm
2020-02-17 01:03:29 +01:00
262b4d95fb
Update projectile.dm
2020-02-16 16:44:29 -07:00
c5eaac62bd
Update materials.dm
2020-02-16 18:26:22 -05:00
0315802330
Update armory.dm
2020-02-16 18:25:54 -05:00
cdf358b97e
Merge pull request #11101 from Ghommie/Ghommie-cit581
...
Porting (admin-only) pair pinpointers and fixing an edge case runtime.
2020-02-16 16:08:11 -07:00
794aeb81c2
Merge pull request #11060 from kevinz000/stuff
...
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
0f7618b348
Update organic.dm
2020-02-16 14:07:00 -05:00
544c7188c3
Merge pull request #11120 from Citadel-Station-13/Ghommie-patch-2
...
Fixing sprint buffer cost and regen being rounded down.
2020-02-16 13:05:50 -06:00
a37e1ab129
Merge pull request #11093 from Ghommie/Ghommie-cit580
...
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
32487a95a3
Fixing sprint buffer cost and regen being rounded down.
2020-02-16 19:23:41 +01:00
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
c0295156ff
Adds synthmeat reaction
2020-02-16 11:42:30 -05:00
3286f43d90
Didnt know I could make it a subtype
2020-02-16 11:17:54 -05:00
313f544aee
Make it require some heating
2020-02-16 08:34:08 -05:00
kevinz000