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 and GitHub
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
Ghom and GitHub
506f1199ad
I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry
2020-02-09 02:56:17 +01:00
Ghom and GitHub
ea9bdcd087
Update gangs.dm
2020-02-09 02:49:20 +01:00
Trilbyspaceclone and GitHub
90a1b249f1
Update gangs.dm
2020-02-08 20:39:45 -05:00
TrilbySpaceClone
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05: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
Seris02 and GitHub
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
Seris02
6af421994a
yay
2020-02-08 13:53:43 +08:00
Ghom and GitHub
1dfba9f416
Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime
...
Fixes a spurious dynamic runtime if nobody votes
2020-02-07 22:41:48 +01:00
Lin and GitHub
5717700146
Merge pull request #10925 from Ghommie/Ghommie-cit558
...
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Putnam
b4faac50a9
yeah "null" is bad juju. why did i do that
2020-02-07 04:41:16 -08:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
Ghommie
7362b89aeb
More stuff.
2020-02-07 08:04:07 +01:00
kevinz000 and GitHub
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 and GitHub
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
Ghommie
86c472eaf6
the holopad fix.
2020-02-07 03:17:00 +01:00
kevinz000 and GitHub
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
Ghom and GitHub
ce6b37da1e
Merge pull request #10920 from Arturlang/debbuging
...
Adds vscode debbuging
2020-02-06 20:33:21 +01:00
Arturlang and GitHub
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 and GitHub
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
9a4432b3ac
initial commit
2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622
Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
...
This reverts commit 3c5a3cb4d4109b15ebdd
2020-02-05 23:50:41 -07:00
kevinz000 and GitHub
3c5a3cb4d4
Merge pull request #10883 from ancientpower/ghost-newscasters
...
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000 and GitHub
e0dd12ecbd
Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
...
Fixes some mounted defibrillator issue.
2020-02-05 23:45:45 -07:00
kevinz000 and GitHub
50cabc3c64
Merge pull request #10889 from Ghommie/Ghommie-cit555
...
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000 and GitHub
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
a3e2ec372f
Makes it compile also custom emote fix.
2020-02-06 01:40:14 +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 and GitHub
98c721fffc
Update cart.dm
2020-02-05 13:29:31 -07:00
Artur
c2b68d0ba3
Adds debbuging
2020-02-05 20:35:24 +01: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 and GitHub
77eb7b8a96
Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL
...
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
2020-02-05 07:02:11 +01:00
Ghom and GitHub
472bddb5be
Merge pull request #10869 from kevinz000/WHY
...
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
2020-02-05 06:52:20 +01:00
Ghom and GitHub
16fbdd9054
Update Sleeper.dm
2020-02-05 06:45:24 +01:00
Ghom and GitHub
ee2ab7c9f0
Update defibrillator_mount.dm
2020-02-04 23:51:55 +01:00
Ghom and GitHub
3cd6cfb7d5
Update defibrillator_mount.dm
2020-02-04 23:50:33 +01:00
TrilbySpaceClone
06fd6645b3
And it wokrs
2020-02-04 16:01:22 -05:00
Lin and GitHub
66638a39b7
Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3
...
Fixing little blood bank gnerator examine runtime error.
2020-02-04 20:36:28 +00:00
keronshb