PsiOmegaDelta
a9f7b3a325
Merge pull request #11247 from Hubblenaut/laundry
...
Adds laundry basket
2015-10-31 11:16:14 +01:00
mwerezak
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
PsiOmegaDelta
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
Hubblenaut
ba19c28c33
Adds laundry basket
2015-10-09 17:03:41 +02:00
PsiOmegaDelta
55c9f7533b
Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name.
2015-10-07 08:56:13 +02:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
PsiOmegaDelta
a3a1f495a3
Implements my own comment suggestions and updates Travis' macro count.
2015-10-01 09:56:30 +02:00
PsiOmegaDelta
8eee143177
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
Joseph Heinemeyer
9e9df0a15d
Delete ladders.dm
2015-09-26 17:43:52 -07:00
Hubblenaut
f0481b551e
Fixes grab-buckling overwriting pixelshift
2015-09-26 14:11:01 +02:00
PsiOmega
38c0251b6d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-21 17:35:49 +02:00
PsiOmega
5b4c7340e4
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-21 17:26:19 +02:00
Zuhayr
a985e036f0
Minor cleanup.
2015-09-21 20:43:53 +09:30
Zuhayr
bfe1d5a599
Span classes.
2015-09-21 20:36:51 +09:30
Zuhayr
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
PsiOmegaDelta
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
Hubblenaut
4eef7ab65d
Fixes beds occasionally buckling in odd directions
2015-09-19 15:27:24 +02:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
mwerezak
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
PsiOmegaDelta
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
PsiOmega
0d91ca0dfd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
PsiOmega
0c21ef741e
Fixes #10988 .
...
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926 .
2015-09-12 20:43:24 +02:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
Zuhayr
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Zuhayr
f8bf428e66
Merge pull request #10981 from comma/technoir
...
MrSnapwalk's Detective Uniform Resprite
2015-09-06 00:48:50 +09:30
Zuhayr
8c743329df
Merge pull request #10955 from SkyMarshal/multi-z
...
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
Chinsky
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03:00
Atlantis
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
SkyMarshal
772c320303
Multi-Z.
2015-08-30 14:15:20 -07:00
PsiOmega
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
PsiOmegaDelta
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Zuhayr
bcca0d4aee
Merge pull request #10842 from mwerezak/showers
...
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
863d75076d
Merge pull request #10759 from mwerezak/girders
...
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
2015-08-24 17:28:08 +09:30
mwerezak
286e16a0f3
Fixes cryogenic showers
...
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
2015-08-24 00:11:40 -04:00
MrSnapwalk
d45d46f920
Resprites, renames, and repaths the detective uniforms.
2015-08-22 19:43:28 -05:00
mwerezak
d62ff87ec9
Fixes #10689
...
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
PsiOmega
e48fbdd1e6
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
mwerezak
4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
