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 |
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01: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
|
de5186026d
|
Update twohanded.dm
|
2020-02-06 01:10:47 -07: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
|
38536cd02d
|
repath that
|
2020-02-06 00:05:07 -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 |
|
kevinz000
|
643eeb9474
|
Update twohanded.dm
|
2020-02-05 05:05:11 -07:00 |
|
kevinz000
|
77667dc1d2
|
Update twohanded.dm
|
2020-02-05 04:51:16 -07:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08: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 |
|
kevinz000
|
477853891d
|
Update twohanded.dm
|
2020-02-04 23:54:10 -07: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 |
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
kevinz000
|
f3d955f397
|
Merge branch 'master' into staves
|
2020-02-04 14:54:35 -07: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 |
|
TrilbySpaceClone
|
c8dff8fbc5
|
it just works
|
2020-02-04 04:18:44 -05:00 |
|
Ghommie
|
a0caada859
|
runtime drifting
|
2020-02-04 08:05:27 +01:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
kevinz000
|
09bb223af0
|
eh fine
|
2020-02-03 15:49:41 -07:00 |
|
kevinz000
|
9b4e40e3a7
|
on second thought, fitting on OCLOTHING slot is a bad idea
|
2020-02-03 13:48:03 -07:00 |
|
kevinz000
|
c69446d2d1
|
woops miscalculated
|
2020-02-03 13:46:54 -07:00 |
|
kevinz000
|
dd113f5c71
|
L
|
2020-02-03 13:39:36 -07:00 |
|
kevinz000
|
e1ed34dcde
|
s
|
2020-02-03 13:38:18 -07:00 |
|
kevinz000
|
8556bcf2b3
|
compile
|
2020-02-03 13:36:10 -07:00 |
|
kevinz000
|
70beec5985
|
woops
|
2020-02-03 13:30:41 -07:00 |
|
kevinz000
|
e9ec314cf6
|
yo this is a horrible idea
|
2020-02-03 13:15:12 -07:00 |
|
kevinz000
|
3e30c9409b
|
riot staves
|
2020-02-03 13:11:26 -07: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 |
|