Commit Graph

25 Commits

Author SHA1 Message Date
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
kevinz000
2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Chemlight
5174ab881a X-01 MultiPhase Energy Gun Buff
Increased the charge capacity of the X-01's blaster by 60% along with it's charge capacity, allowing 16 lethal shots, 40 disabler, or 16 stun shots. Origionally the stun energy cost was at a whole 200 charge reduction , now being 100 to represent the power in comparison to a tactical energy gun that spent half the amount of energy in comparison.
2020-10-17 00:03:31 -07:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Chemlight
6ad704e532 Round start Warden shotgun
"Due to unfortunate events with mishandling equipment in the security departments, we have exchanged the mutinition found in the compact shotgun found in the warden's locker due to a 'workplace hazard',"
2020-09-24 21:23:41 -07:00
BoxyBoy
5a7ac28c16 Adds a FAL
Adds code and spirtework for an FAL.
2020-07-03 17:52:58 -06:00
Dahlular
e72ad9ebd4 Merge pull request #241 from improvedname/n-thats-jazzzz
Ports more stuff
2020-03-22 22:05:05 -06:00
Dahlular
2459570517 Merge pull request #232 from improvedname/War
Does #231 but properly
2020-03-22 20:27:55 -06:00
Improvedname
78786b28da ff 2020-03-22 19:17:51 +01:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Improvedname
f014a310f6 Boom 2020-03-17 17:53:22 +01:00
Muhreen
4ce7bdf8fe Adds the code that makes the new icons work
awooogoaaaaaa
2020-02-27 17:00:40 -03:00
CygnusB
6cdbdca11f Fixes Dueling.dm examine error
and also fixes my retardation
2020-02-03 09:50:25 -03:00
CygnusB
34f71c489b It's 12 o'clock
Darn tootin' pardner
2020-01-31 19:03:44 -03:00
Azarak
db540ac496 Botany stuffs 2019-12-06 17:54:19 +01:00
Azarak
d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
quotefox
b9a598bbd9 Merge pull request #36 from shellspeed1/Organ-updates-for-stasis-beds
Massive organ overhaul and some new surgeries ported from cit orginally created by Fermi. Mergeable
2019-10-18 21:47:14 +01:00
quotefox
5647d09269 projectile slowed abit 2019-10-15 09:44:08 +01:00
shellspeed1
470ec5d62b whew 2019-10-14 18:46:06 -07:00
quotefox
bd718654c3 update dump! 2019-10-14 16:48:21 +01:00
Azarak
e60f0ef180 Atmos update 2019-10-05 02:58:05 +02:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00