oranges
20b8f9c87f
Merge pull request #33833 from deathride58/please-repoban-kev
...
Fixes ghost zoom being broken
2017-12-26 23:50:33 -06:00
deathride58
dc0e3a89d5
Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3
...
readds shock collars
2017-12-26 22:10:09 +00:00
CitadelStationBot
8aed987bd9
[MIRROR] Fixes emagged cleanbot acid attack doing no damage ( #4544 )
...
* Fixes emagged cleanbot acid attack doing no damage (#33848 )
* Fixes emagged cleanbot acid attack doing no damage
2017-12-26 13:58:16 -08:00
LetterJay
290c1e0868
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916
2017-12-26 08:24:20 -06:00
LetterJay
14472e5139
Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485
...
[MIRROR] code improvements from mso and co
2017-12-26 07:38:17 -06:00
LetterJay
7be17b6f12
Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639
...
[MIRROR] Golems can wear labcoats
2017-12-26 07:38:06 -06:00
LetterJay
358c625ed3
Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590
...
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-26 05:59:52 -06:00
LetterJay
e51baed92e
Update labcoat.dm
2017-12-26 05:27:01 -06:00
LetterJay
4b79ee5e94
Merge pull request #4527 from Citadel-Station-13/upstream-merge-33736
...
[MIRROR] Ghosts can *spin and *flip
2017-12-25 22:25:54 -06:00
LetterJay
4cefd9219f
Update say.dm
2017-12-25 21:32:05 -06:00
LetterJay
a7a0823594
Update say.dm
2017-12-25 21:31:50 -06:00
LetterJay
41bae055ba
Merge pull request #4524 from Citadel-Station-13/upstream-merge-33816
...
[MIRROR] gives medical some medical boards, but not their own circuit imprinter yet
2017-12-25 21:30:31 -06:00
LetterJay
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
LetterJay
374ab40f4a
Merge pull request #4497 from Citadel-Station-13/upstream-merge-33731
...
[MIRROR] Tweaks the syndicate infiltrator so it's no longer lopsided.
2017-12-25 21:26:34 -06:00
LetterJay
134201d185
Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433
...
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-25 21:26:17 -06:00
coiax
703667bdff
Ghosts can *spin and *flip
2017-12-25 17:11:29 -06:00
kevinz000
b0f793f435
gives medical some medical boards, but not their own circuit imprinter yet ( #33816 )
...
* medical gets med boards
* sleepers/cryo too
2017-12-25 16:42:18 -06:00
LetterJay
6205268f7e
Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661
...
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
2017-12-25 07:28:52 -06:00
LetterJay
62a9649a98
Update disease_outbreak.dm
2017-12-25 05:23:37 -06:00
LetterJay
7b40f3f0e0
Update disease_outbreak.dm
2017-12-25 05:09:21 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
kevinz000
cab61abc32
Update autolathe_designs.dm
2017-12-24 23:29:33 -08:00
kevinz000
30bc560972
readds shock collars
2017-12-24 21:48:06 -08:00
LetterJay
3966774d09
Merge pull request #4440 from Citadel-Station-13/upstream-merge-33655
...
[MIRROR] Non movement keys pressed while moving no longer stop movement
2017-12-24 22:10:15 -06:00
LetterJay
8f6960e1a3
Merge pull request #4522 from Citadel-Station-13/upstream-merge-33579
...
[MIRROR] [READY]Circuitry upgrades
2017-12-24 22:09:42 -06:00
deathride58
d8e25d9501
Merge pull request #4499 from Citadel-Station-13/upstream-merge-33713
...
[MIRROR] if the deflection chance is < 100%, it won't say they can never be hit by ranged weapons
2017-12-24 23:06:28 +00:00
deathride58
9ce056322a
Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714
...
[MIRROR] Job landmarks now show the mob with the proper job outfit.
2017-12-24 23:05:36 +00:00
deathride58
6dc2d8f0eb
Update reagents.dm
2017-12-24 18:02:13 -05:00
LetterJay
a81e2aa31b
Merge pull request #4519 from Citadel-Station-13/upstream-merge-33789
...
[MIRROR] Fixes soapstone time.
2017-12-24 17:00:51 -06:00
LetterJay
0f86dd3f72
Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306
...
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-24 17:00:06 -06:00
LetterJay
244b68b17b
Merge pull request #4505 from Citadel-Station-13/upstream-merge-33737
...
[MIRROR] Gibber rebalance
2017-12-24 16:52:14 -06:00
LetterJay
258910c731
Merge pull request #4500 from Citadel-Station-13/upstream-merge-33732
...
[MIRROR] Fixes message spam when proccalls are delayed due to another admin's proccalls running
2017-12-24 16:51:35 -06:00
arsserpentarium
a893559c6b
[READY]Circuitry upgrades
2017-12-24 15:03:45 -06:00
FrozenGuy5
0068bb2ed2
adds world.realtime to soapstone
2017-12-24 15:03:22 -06:00
Jordan Brown
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
coiax
f40d74e52f
Gibber rebalance ( #33737 )
...
🆑 coiax
balance: The kitchen gibber must be anchored in order to use.
balance: The gibber requires bodies to have no external items or
equipment.
/🆑
Unanchoring the gibber, running around with it, ebowing people, then
shoving them in is not fun.
As a double check, you REALLY should be stripping them of all that
cloth, it'll jam up the gears.
- Removes the abiotic() proc, it's literally used only in the gibber.
2017-12-22 18:03:38 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
CitadelStationBot
6856fc1be2
[MIRROR] [s] Fixes the frying oil reagent ( #4504 )
...
* Merge pull request #33745 from vuonojenmustaturska/oilfix
[s] Fixes the frying oil reagent
* [s] Fixes the frying oil reagent
2017-12-22 12:32:56 -08:00
kevinz000
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
kevinz000
454c073d22
Fixes message spam when proccalls are delayed due to another admin's proccalls running ( #33732 )
...
* Fixes proccall block message spam
* One thread
2017-12-22 10:40:25 -06:00
Armhulen
716e4da53e
cool beans, partner ( #33713 )
2017-12-22 10:39:14 -06:00
WJohn
6cfd346bdd
Tweaks the syndicate infiltrator so it's no longer lopsided. ( #33731 )
2017-12-22 10:35:47 -06:00
LetterJay
b9ec312d94
Update client_procs.dm
2017-12-22 03:16:28 -06:00
kevinz000
a82d0e13ce
Fixes RND
2017-12-22 00:58:46 -08:00
oranges
a89435ac33
Merge pull request #32433 from kevinz000/vector_projectiles
...
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-21 19:33:42 -06:00
oranges
4e8898d55f
Merge pull request #33714 from lzimann/icon
...
Job landmarks now show the mob with the proper job outfit.
2017-12-21 19:27:23 -06:00
Jordan Brown
b188266478
Merge pull request #33709 from uraniummeltdown/linespacing
...
Adjustable Chat Line Height
2017-12-21 14:25:21 -06:00
deathride58
53e7d47893
Merge pull request #4407 from Citadel-Station-13/upstream-merge-33581
...
[MIRROR] add view range respects widescreen
2017-12-21 20:19:04 +00:00
Matthew
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
LetterJay
087c43ab71
Update rdmachines.dm
2017-12-21 12:44:59 -06:00
