Commit Graph

18896 Commits

Author SHA1 Message Date
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
PsiOmega
086517f988 Closes a span class.
Has somehow gone unnoticed until now.
2015-06-03 17:57:57 +02:00
mwerezak
61469d312a Fixes scrubber power draw 2015-06-02 22:52:35 -04:00
mwerezak
17008aa7ed Copies vent pump hibernation over to scrubbers 2015-06-02 22:51:45 -04:00
mwerezak
bf231a2925 Fixes #9600
All atmos machines now reset last_flow_rate and last_power_draw when
processing.
2015-06-02 22:33:26 -04:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551 Fixes #9640 2015-06-02 22:00:34 -04:00
mwerezak
0777f9c998 Fixes #9648
Robotic limbs are no longer able to mutate.
2015-06-02 21:40:30 -04:00
Chinsky
807a92f6d7 Merge pull request #9647 from GinjaNinja32/eftpos
Fixes #9645
2015-06-02 22:42:48 +03:00
GinjaNinja32
5a2933bb4f Fixes #9645 2015-06-02 20:39:03 +01:00
Zuhayr
04d1b40e3d Merge pull request #9626 from GinjaNinja32/vine_event_fix
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
Zuhayr
49e121bb7a Merge pull request #9630 from PsiOmegaDelta/150602-EventTweak
Active role counting tweak.
2015-06-03 04:00:17 +09:30
Zuhayr
da3ee37df9 Merge pull request #9638 from PsiOmegaDelta/150602-LawSets
Allows all synths to view the alternative law sets.
2015-06-03 04:00:11 +09:30
Zuhayr
fe37da05ce Merge pull request #9639 from PsiOmegaDelta/150602-EyeTracking
Eye mobs are now listed in the observer tracking list.
2015-06-03 03:59:58 +09:30
PsiOmegaDelta
2514c56c01 Merge pull request #9642 from comma/cryopod
Saves rank and time too in cryopod logs.
2015-06-02 20:17:08 +02:00
GinjaNinja32
24adb8eb42 Fixes vine/infestation events not working with new lighting
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
Chinsky
f8cfd491f7 Now with radios 2015-06-02 18:38:49 +03:00
Chinsky
5ed365d96b Saves rank and time too in cryopod logs.
It's usually very hard to guess who all those people are on pure name list, and purging records screws over investigations enough as it is :<
2015-06-02 18:34:47 +03:00
Chinsky
886462c100 Merge pull request #9637 from PsiOmegaDelta/150602-LessRightClicking-Master
Reduction of admin right-click verbs.
2015-06-02 16:53:56 +03:00
PsiOmegaDelta
1a74b536d7 Active role counting tweak.
The number of Any players now properly respects activity.
Borgs should now properly increase the number of players for a given job.
2015-06-02 15:46:01 +02:00
PsiOmegaDelta
de97e18e5f Eye mobs are now listed in the observer tracking list.
Fixes #9636.
2015-06-02 15:41:14 +02:00
GinjaNinja32
9ecde8f2a7 Merge pull request #9633 from comma/dev-freeze
Couple fixes
2015-06-02 14:37:07 +01:00
PsiOmegaDelta
3f26eeac99 Allows all synths to view the alternative law sets.
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
2015-06-02 14:48:08 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs.
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a69d0a4f7 More MayRespawn checks.
Astral projecting wizards/cultists may no longer respawn as something else.
2015-06-02 13:40:53 +02:00
Chinsky
c873825a42 Fixes #6029 2015-06-02 14:27:16 +03:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
Chinsky
87c32af3dc Fixes #9545 2015-06-02 14:00:39 +03:00
Chinsky
28c8cd1d81 Fixes #9623
Also added a nullcheck for icons to prevent potential client crash.
2015-06-02 13:13:44 +03:00
PsiOmegaDelta
e70faa20ee Merge pull request #9629 from GinjaNinja32/spawn
Spawn fixes
2015-06-02 08:05:54 +02:00
GinjaNinja32
5ebece6368 Spawn fixes
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
2015-06-02 02:24:32 +01:00
Chinsky
26167895b5 Merge pull request #9621 from PsiOmegaDelta/150601-Adminhelp
Admin PM replies now sent to IRC.
2015-06-01 21:08:22 +03:00
PsiOmega
0aade86d5f Admin PM replies now sent to IRC.
Now both ahelps and their replies should be sent to an IRC channel, if configured.
2015-06-01 19:43:54 +02:00
Yoshax
63f253a301 Makes hyposprays start empty 2015-06-01 17:17:16 +01:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
GinjaNinja32
d5e0a60a6b Merge pull request #9566 from PsiOmegaDelta/150529-Doors
Fixes #9559.
2015-05-31 20:11:33 +01:00
GinjaNinja32
c1cc002109 Merge pull request #9601 from Techhead0/survivalBox
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46 Re-adds extended oxygen tanks to relevant jobs. 2015-05-31 14:08:46 -04:00
Techhead0
aa2564b798 Fixes #9556
Also fixes missing backpacks for assistants.
2015-05-31 14:03:41 -04:00
Techhead0
99e9172d31 Cleans up Vox survival gear, adds belt icons to emergency nitrogen tanks. 2015-05-31 13:04:32 -04:00
Techhead0
3620c49b08 Fixes #9462 2015-05-31 12:41:39 -04:00
Chinsky
10218eb8c9 Merge pull request #9573 from Zuhayr/chairs
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d Added MATERIAL_PADDING flag. 2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f Merge pull request #9582 from mwerezak/robolimbs
limb fixes
2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be Sets w_class for external organs
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
mwerezak
f23a656526 Replaces assignments to health with max_damage
Except where they were already equal.
2015-05-30 19:02:06 -04:00
mwerezak
217e7b966f sharp no longer causes DROPLIMB_EDGE 2015-05-30 19:01:34 -04:00
mwerezak
43cc0e6705 Fixes internal organs only being damaged with prob(5) if brute_dam >= max_damage 2015-05-30 19:01:01 -04:00
PsiOmega
2f1202d5e0 Airlock fixes.
Changes door closing to use the same sound playing setup as door opening. Fixes #9559.
2015-05-30 20:41:25 +02:00