d43b4599ef
I was bullied to reduce click delay.
2019-08-26 15:53:44 -05:00
13638ed5d6
Reverts some changes I deemed unneccesary. Undoes a fuckup
2019-08-26 15:08:36 -05:00
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
a4fd2be7f7
Various Shotgun Nerfs.
2019-08-26 14:45:12 -05:00
74a24fdcc1
WHAT IN TARNATION
2019-08-26 14:30:27 -05:00
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
20f4e260e1
minigun ooga
2019-08-23 19:39:20 -04:00
3c59b43ff7
Update shotgun.dm
2019-08-21 06:39:18 -07:00
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
f59abbf073
Merge pull request #8942 from jakeramsay007/WardenShotgun
...
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
b52462de0d
Merge pull request #8958 from Trilbyspaceclone/emitter_gun
...
Makes a new traitor Emitter gun for Engi memes
2019-08-01 23:29:10 -07:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
085251f5f7
update_icon
2019-07-30 04:35:54 +01:00
969b928642
Update special.dm
2019-07-29 07:53:41 -04:00
f9dfe5ae97
Update special.dm
2019-07-29 07:53:11 -04:00
13936e97de
emiting happyness
2019-07-24 14:40:59 -04:00
1c8768afe4
Redundant Redundancies made Redundant
2019-07-22 19:31:42 +01:00
ede61d8cb2
Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded.
2019-07-22 00:55:41 +01:00
7065a86841
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
2019-07-19 22:02:22 +02:00
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
835e91d46e
compile
2019-07-14 05:13:47 -07:00
9081b5b773
Revert "Fixes rocket launchers, buffing their accuracy etc."
...
This reverts commit 1c6156dd0e
2019-07-08 07:17:49 +02:00
1c6156dd0e
Fixes rocket launchers, buffing their accuracy etc.
2019-07-08 06:56:20 +02:00
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
f39a5d2f6a
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
2019-06-30 21:53:33 +02:00
f7dcedce5f
Merge pull request #8715 from Sishen1542/toxinmanbad
...
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
0a43036eae
hugboxing slimepeople one thing at a time
2019-06-21 20:01:19 -04:00
88ec4e336e
Small oops.
2019-06-20 03:34:49 +01:00
e0cada7965
Quick fix for a runtime
2019-06-19 01:08:23 +01:00
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
d5279c8373
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-17 09:51:22 +02:00
17403bd059
Non-functioning EMP code for review (revert before merging.)
2019-06-13 00:58:54 +01:00
3f34e3c93d
Update stun.dm
2019-06-08 03:30:25 -07:00
2f2885f1d6
Merge pull request #8558 from Ghommie/Ghommie-cit35
...
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
487461fbda
Merge pull request #8500 from Trilbyspaceclone/patch-158
...
Buffs stun slugs
2019-06-08 01:09:00 -07:00
7fcb46e0f6
Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41
...
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
2019-06-08 01:09:52 -04:00
b6788cdd64
Updated projectile sprite.
2019-06-08 01:45:32 +01:00
42d0ab4825
Comment cleanup.
2019-06-08 01:31:21 +01:00
9fcbac0323
Lil flavour.
2019-06-08 01:23:57 +01:00
65b218d4c3
Spritework.
2019-06-08 00:31:14 +01:00
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
2888e1b30b
Dartgun functions as intended.
2019-06-07 00:12:11 +01:00
Tupinambis