 Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
|
kevinz000
|
b0b274762c
|
Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
|
2019-10-11 12:10:31 -07:00 |
|
|
Ghommie
|
689136fe94
|
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
|
2019-10-09 23:07:39 +02:00 |
|
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11:00 |
|
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
|
YakumoChen
|
e297dbd0a3
|
Update energy_gun.dm
|
2019-09-21 02:39:47 +00:00 |
|
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
|
kevinz000
|
39beca1a0f
|
Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
|
2019-09-13 10:47:15 -07:00 |
|
|
Poojawa
|
65a89030eb
|
reverts the bleed changes till they can be better tuned
|
2019-09-12 00:14:26 -05:00 |
|
|
Poojawa
|
4fa09059d7
|
Medibeam heals bleed_rate and radiation
|
2019-09-11 04:38:09 -05:00 |
|
|
kevinz000
|
87cf0b971a
|
Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
|
2019-09-06 16:47:46 -07:00 |
|
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
|
Sishen
|
d9fff579b1
|
damage and stamina balances
|
2019-08-31 17:39:51 -04:00 |
|
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|
|
Sishen
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04:00 |
|
|
nik707
|
01f732c57a
|
Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
|
2019-08-29 19:29:14 -05:00 |
|
|
Sishen
|
47ee3a8a6d
|
fuck
|
2019-08-28 23:56:08 -04:00 |
|
|
Ghommie
|
18b023b127
|
arg
|
2019-08-28 04:47:53 +02:00 |
|
|
Ghommie
|
e25697dc14
|
rocket fix.
|
2019-08-28 03:37:35 +02:00 |
|
|
Tupinambis
|
d43b4599ef
|
I was bullied to reduce click delay.
|
2019-08-26 15:53:44 -05:00 |
|
|
Tupinambis
|
13638ed5d6
|
Reverts some changes I deemed unneccesary. Undoes a fuckup
|
2019-08-26 15:08:36 -05:00 |
|
|
Tupinambis
|
a4fd2be7f7
|
Various Shotgun Nerfs.
|
2019-08-26 14:45:12 -05:00 |
|
|
Sishen
|
20f4e260e1
|
minigun ooga
|
2019-08-23 19:39:20 -04:00 |
|
|
kevinz000
|
3c59b43ff7
|
Update shotgun.dm
|
2019-08-21 06:39:18 -07:00 |
|
|
Poojawa
|
32c7a7c3ee
|
Virology's broken as fuck, damnifino why
|
2019-08-21 03:36:40 -05:00 |
|
|
Poojawa
|
264cbf8108
|
reverts the add_blood back to add_blood_DNA
|
2019-08-15 12:49:10 -05:00 |
|
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
|
Chayse Ramsay
|
085251f5f7
|
update_icon
|
2019-07-30 04:35:54 +01:00 |
|
|
Trilbyspaceclone
|
969b928642
|
Update special.dm
|
2019-07-29 07:53:41 -04:00 |
|
|
TrilbySpaceClone
|
13936e97de
|
emiting happyness
|
2019-07-24 14:40:59 -04:00 |
|
|
Chayse Ramsay
|
1c8768afe4
|
Redundant Redundancies made Redundant
|
2019-07-22 19:31:42 +01:00 |
|
|
Chayse Ramsay
|
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 |
|
|
Ghommie
|
7065a86841
|
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
|
2019-07-19 22:02:22 +02:00 |
|
|
Ghommie
|
9081b5b773
|
Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
|
2019-07-08 07:17:49 +02:00 |
|
|
Ghommie
|
1c6156dd0e
|
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-08 06:56:20 +02:00 |
|
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
|
kevinz000
|
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 |
|
|
Sishen
|
0a43036eae
|
hugboxing slimepeople one thing at a time
|
2019-06-21 20:01:19 -04:00 |
|
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
|
kevinz000
|
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 |
|
|
Fermi
|
9fcbac0323
|
Lil flavour.
|
2019-06-08 01:23:57 +01:00 |
|
|
Fermi
|
65b218d4c3
|
Spritework.
|
2019-06-08 00:31:14 +01:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|