Ghom
bfdef7fcfd
Merge pull request #10755 from kevinz000/attack_chain
...
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
kevinz000
40111faab1
Update geiger_counter.dm
2020-02-13 00:12:25 -07:00
kevinz000
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
kevinz000
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
kevinz000
5d2b2d7fbf
Merge pull request #10971 from Trilbyspaceclone/disco_baby
...
Adds more Alien disco
2020-02-10 04:14:18 -07:00
Ghom
0d37700836
Merge pull request #10926 from keronshb/PirateBombProof
...
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
keronshb
1492586f76
Fixes round 3? 4?
...
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00
keronshb
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
Ghom
c7614958bc
Merge pull request #10937 from Arturlang/debug_outfit_updates
...
Updates the debug outfit
2020-02-09 22:49:22 +01:00
Ghom
c2baad44d8
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
...
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
keronshb
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
Arturlang
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
TrilbySpaceClone
30c78c5be2
Let their be lists
2020-02-08 02:37:37 -05:00
Seris02
0b1cb9db6d
timer'd
2020-02-08 15:25:11 +08:00
TrilbySpaceClone
76219e0188
Primortial
2020-02-08 02:21:14 -05:00
Lin
5717700146
Merge pull request #10925 from Ghommie/Ghommie-cit558
...
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
kevinz000
4e2e411dd0
Merge pull request #10929 from Ghommie/Ghommie-cit559
...
Double-esword and hypereuplastic blade toys are now blunt.
2020-02-06 23:51:17 -07:00
Ghom
cee2410091
Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5
...
renames the lawyer cartridge to something more accurate to its function
2020-02-07 05:53:09 +01:00
kevinz000
62b0e62952
Merge pull request #10623 from Putnam3145/antag-overhaul
...
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Arturlang
0353f1602d
Fixes ore boxes
2020-02-06 20:10:02 +01:00
Artur
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
kevinz000
75d3a8b35d
Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
...
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
kevinz000
50cabc3c64
Merge pull request #10889 from Ghommie/Ghommie-cit555
...
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000
d0cd33a5ea
Merge pull request #10899 from Trilbyspaceclone/vender-hate
...
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
Ghommie
8131a60f3a
Oh.
2020-02-06 02:10:03 +01:00
Ghommie
523e080f87
Double-esword and hypereuplastic blade toys are sharp now blunt.
2020-02-06 02:09:27 +01:00
Ghommie
233ed5873f
race conditions and turfs beings special.
2020-02-06 01:13:28 +01:00
keronshb
5d1d652ea4
Buffs the Pirate Ship to be bomb proof
...
Title, also makes a few computers/machines indestructible and buffs turret health. It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b
runtime is forever, errors are eternal.
2020-02-05 23:48:17 +01:00
kevinz000
98c721fffc
Update cart.dm
2020-02-05 13:29:31 -07:00
Seris02
d0100345fd
done hopefully
2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
Tupinambis
3539fa7603
Stunbaton PR had bad math didn't properly reduce effectiveness oops.
2020-02-05 00:31:54 -06:00
Ghom
77eb7b8a96
Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL
...
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
2020-02-05 07:02:11 +01:00
TrilbySpaceClone
06fd6645b3
And it wokrs
2020-02-04 16:01:22 -05:00
kevinz000
13df3dbb05
Merge pull request #10867 from Ghommie/Ghommie-cit551
...
Further buff and fix to the clown ops' tearstache grenade.
2020-02-04 03:55:22 -07:00
kevinz000
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000
f5cd0cf48f
Merge pull request #10872 from Arturlang/reflective_ornot
...
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
2020-02-04 03:34:16 -07:00
kevinz000
8f83e8c107
Merge pull request #10860 from deathride58/combatmodeclickdrag
...
Makes quick item usage (click-dragging unequipped item) require combat mode
2020-02-04 03:32:39 -07:00
kevinz000
97583bd98f
Merge pull request #10853 from Ghommie/Ghommie-cit549
...
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Seris02
49f80d52a8
bug fixes
2020-02-04 17:18:45 +08:00
Ghommie
a0caada859
runtime drifting
2020-02-04 08:05:27 +01:00
kevinz000
8910efadfa
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
2020-02-03 13:07:49 -07:00
Putnam
53cad493a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
2020-02-03 03:17:23 -08:00
Artur
5bf1ebaa53
Initial Commit
2020-02-03 12:01:17 +01:00
Ghom
ccd557122c
Update holosign.dm
2020-02-03 08:35:47 +01:00
Ghom
f2fd48bfd9
Update holosign.dm
2020-02-03 08:31:12 +01:00
Ghommie
84d9430ee4
PC too slow for compile.
2020-02-03 07:21:39 +01:00
Ghommie
81b5fe2de3
Further buff and fix for clown ops tearstache nade.
2020-02-03 07:08:47 +01:00
