Atlantis
b16bf61d03
Implements Destroy() for buildable SMES units.
...
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
2015-06-06 09:43:39 +02:00
Atlantis
69e0ebf71e
Implements Destroy() for organs
...
- This fixes annoying roundstart GC errors, and should fix other limb/organ related GC errors as well.
2015-06-06 07:21:34 +02:00
PsiOmegaDelta
7f9996eece
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-05 10:23:23 +02:00
Karolis2011
9ff27dc038
Now when welding sorting pipe, game update it's name
2015-06-04 20:48:57 +03:00
Dennok
05b4c97e1a
fix #9666
...
up
2015-06-04 18:46:27 +03:00
PsiOmegaDelta
65fc980b20
Stack splitting and cable merging fixes.
...
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
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
Zuhayr
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
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
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
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
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
PsiOmegaDelta
4a976e1ee2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-02 13:13:40 +02: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
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
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
Zuhayr
b3102824a0
Fixes #9544
2015-05-31 03:56:06 +09:30
Zuhayr
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
Zuhayr
bf1733640a
Fixes #9586
2015-05-31 02:56:54 +09:30
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
40780165a2
Merge pull request #9569 from comma/master
...
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 12:36:14 +09:30
Chinsky
f61380adfc
Merge pull request #9576 from GinjaNinja32/shuttle_logging
...
Shuttle improvements
2015-05-30 03:15:18 +03:00
