Commit Graph

18915 Commits

Author SHA1 Message Date
Zuhayr
589aecd40e Merge pull request #9691 from Baystation12/master
master into dev-freeze
2015-06-05 21:41:58 +09:30
Chinsky
19e0a94c17 Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat
Removes some qdel:s of lists.
2015-06-05 15:10:53 +03:00
Chinsky
f163650cb2 Merge pull request #9652 from mwerezak/inflatable
Corrects comment, multiz stub, no-zone default
2015-06-05 14:48:30 +03:00
Chinsky
e1d6af1d27 Fixes #9352 2015-06-05 14:30:01 +03:00
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists.
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta
c21985f39d Merge pull request #9679 from GinjaNinja32/humans_are_not_hats
Removes briefcase instastun and crappy helmet check
2015-06-05 10:17:02 +02:00
Zuhayr
c3c40ed7f5 Merge pull request #9665 from PsiOmegaDelta/150604-DatumPool
Fixes #9664.
2015-06-05 17:36:31 +09:30
GinjaNinja32
67ccb6997b Entirely removes briefcase instastun and pointless New() definition 2015-06-05 09:00:19 +01:00
Chinsky
74cbb2c5d8 Merge pull request #9672 from PsiOmegaDelta/150604-qdel
Garbage/qdel changes.
2015-06-05 10:36:23 +03:00
GinjaNinja32
2507a8007b Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head 2015-06-05 01:10:15 +01:00
GinjaNinja32
e44a4805f2 Merge pull request #9663 from PsiOmegaDelta/150604-StackFixes
Stack splitting and cable merging fixes.
2015-06-04 23:19:08 +01:00
Karolis2011
9ff27dc038 Now when welding sorting pipe, game update it's name 2015-06-04 20:48:57 +03:00
PsiOmegaDelta
224cbb41bf Garbage/qdel changes.
Moves atom/Destroy() into atom/movable/Destroy(). Is now a /tg/ copy-paste.
Means deleting turfs no longer wipes everything on that turf and that pulling is canceled.
qdel no longer willingly accepts lists.
2015-06-04 19:32:05 +02:00
Dennok
05b4c97e1a fix #9666
up
2015-06-04 18:46:27 +03:00
PsiOmegaDelta
6fb1ea85e1 Adds a notice to StaffWho that adminhelps are also sent to IRC. 2015-06-04 15:21:42 +02:00
PsiOmegaDelta
2373eb4bdd Fixes #9664.
Datum pool no longer creates a new object just for the sake of it when initializing pool lists.
Also bandaids an issue where water could be qdeled while being sprayed and reagents nulled, because someone calls spawn() qdel in new.
Datum pool now also adds excess pool objects on the trash pile instead of calling del directly.
2015-06-04 14:42:39 +02: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
mwerezak
8b11ad89f7 Corrects comment, multiz stub, no-zone default 2015-06-02 23:49:06 -04: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