DeltaFire
1e8e1ec72b
Merge pull request #13786 from kiwedespars/why
...
x-ray laser nerfs
2020-12-19 05:28:43 +01:00
kiwedespars
9b710f5553
Update beams.dm
2020-12-18 15:53:11 -08:00
kiwedespars
98c3335dce
doubles xray laser cost, 20 -> 10 shots
2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17
Update beams.dm
...
25 -> 75 rad
15 -> 20 damage
2020-12-15 21:02:46 -08:00
kiwedespars
92c70b8089
Update beams.dm
2020-12-14 19:46:28 -08:00
silicons
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
Trilby
3307711f08
suppression
2020-10-28 13:00:02 -04:00
kappa-sama
b3fc60c3f5
this too
2020-10-20 19:44:10 -04:00
DeltaFire
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
BlackMajor
9e909095a8
Merge pull request #13015 from silicons/combat_rework_experimental
...
Combat v4: Redesigning Stamina, Sprint, Combat mode
2020-10-11 18:38:53 +13:00
silicons
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
DeltaFire
9990337f32
fixes a bunch of portal runtimes
...
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
2020-10-10 23:40:12 +02:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
silicons
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
silicons
8eac1cb939
Merge pull request #13511 from Hatterhat/hakitavolver
...
additional revolver sprites
2020-10-06 16:51:18 -07:00
Hatterhat
5a517be5e7
thanks toriate
2020-10-06 12:47:00 -05:00
DeltaFire
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
Hatterhat
2e7101fdc5
funny revolver sprites - squashed
2020-10-05 22:56:52 -05:00
DeltaFire
d54a899695
fixes KA modkits being installed in borgs by others
...
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
silicons
9fef16964c
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-21 03:13:51 -07:00
Artur
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
silicons
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
silicons
1d8a030070
Update projectile.dm
2020-09-07 05:36:51 -07:00
silicons
9e204f167f
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
...
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
BlackMajor
8b59b4a80d
Merge pull request #13332 from Citadel-Station-13/silicons-patch-31
...
makes magweapons emp-immune
2020-09-06 18:05:34 +12:00
BlackMajor
75e38edb43
Merge pull request #13287 from Citadel-Station-13/revert-13122-haha
...
Reverts load delays because it's still a problem and by god am I just done at this point
2020-09-06 18:01:09 +12:00
silicons
cbcacaa0af
Update magweapon.dm
2020-09-02 15:51:28 -07:00
Artur
d47a670f84
Cant put these on objects..
2020-09-02 19:10:35 +03:00
Artur
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
Trilbyspaceclone
9c8f3305bb
Merge branch 'master' into spike-loot-differentces
2020-08-30 00:41:42 -04:00
silicons
05b5d39732
Update ballistic.dm
2020-08-29 21:38:45 -07:00
silicons
4a3b6054d3
Merge pull request #13266 from Ghommie/Ghommie-cit836
...
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00
silicons
adc75a1d50
Merge branch 'master' into revert-13122-haha
2020-08-28 15:31:38 -07:00
Trilbyspaceclone
c4885d81f3
Merge branch 'master' into spike-loot-differentces
2020-08-27 03:41:14 -04:00
silicons
ff6beea525
rebalances shotgun shell stripper clips since no one else wants to ( #13116 )
...
* Update volumetrics.dm
* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
Ghommie
2811f744e3
Fixing some mistakes with the priority overlays removal PR.
2020-08-26 14:00:35 +02:00
silicons
7737e76b32
Merge pull request #13224 from Ghommie/Ghommie-cit835
...
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
Ghom
cd10655985
fix 2
2020-08-20 23:02:13 +02:00
Ghommie
921a963e59
fix 1
2020-08-20 20:26:29 +02:00
Ghommie
fde859bca0
Removing priority overlays, update_icon() splitup for guns.
2020-08-20 18:33:23 +02:00
lolman360
ee4da21d38
Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha
2020-08-19 12:20:38 +10:00
lolman360
f35989b09e
Merge remote-tracking branch 'upstream/master' into haha
2020-08-19 12:20:07 +10:00
lolman360
5306da7938
Update code/modules/projectiles/guns/ballistic.dm
...
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com >
2020-08-19 12:02:53 +10:00
