Neerti
2aaa4e9a5e
Merge pull request #525 from Zuhayr/qol
...
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
Neerti
dc0711a438
Merge pull request #553 from Woodratt/1.3.1_Holiday_Special
...
1.3.1 Christmas and tweaks.
2015-12-13 16:43:39 -05:00
Dibasic
c024a20893
Fixes window 'bang' typo
...
Fixes the typo when harm-intent clicking a window with your bare hand:
<You bang against the window!
to:
You bang against the window!
2015-12-13 03:18:43 -06:00
woodratt
13adf4f235
1.3.1 Christmas and tweaks.
...
- Intercoms added to the chapel, recreation area, pool.
- Maint door added to the starboard maint.
- Removed the second sleeper from the merc shuttle.
- Replaced the central tree at central with a Christmas tree.
- Added a small Christmas tree, Christmas lights, Tiny Christmas tree, and holiday wreaths to map. (Sprites from Aurora)
- Christmas decorations added everywhere.
- Garden statue tucked into maint, replaced with a big Christmas tree.
- Drink Machine added to security
- Fixed the pathing on therapy dolls.
- Removed farwa plushie from psych office, replaced with blue therapy doll.
2015-12-12 21:14:23 -08:00
Mark9013100
09b9be4b72
Adds a detective belt and other edits for security
2015-12-11 22:43:13 -05:00
Datraen
ef0337fccf
Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels.
2015-12-11 21:14:11 -05:00
Zuhayr
793bc18efd
Mops can now be wet in buckets or sinks.
2015-12-11 15:54:56 +10:30
Neerti
f28a0405a8
Merge pull request #513 from Hubblenaut/tape
...
New Police Tape Icons and Placing Algorithms
2015-12-10 19:51:09 -05:00
Hubblenaut
d4766aa09a
Atmos personal locker spawn with atmos tape roll
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
2015-12-10 19:27:04 +01:00
Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
GinjaNinja32
85373f7c16
fixes #199
2015-12-05 06:03:43 +00:00
Mark9013100
6e0b906e23
Adds Security/Medical cargopacks.
2015-12-03 20:22:12 -05:00
SinTwo
700ee6177b
Clothes Addition, Captain alt title, custom loadout tweakes.
2015-12-03 18:25:45 -05:00
Zuhayr
4d2db18c70
Added a click delay to interactions with the fire axe cabinet.
2015-12-02 20:38:28 +10:30
Jon
8986c49b82
Fixes emagging for secure closets.
2015-12-01 23:53:50 +00:00
Mark9013100
880ba681e6
Combination of my previous PRs, mostly fixes
2015-11-29 11:13:17 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
Chinsky
ba3c1f03d7
Merge pull request #11195 from Hubblenaut/dev
...
CtrlClick deflates inflatables
2015-11-02 00:11:14 +03:00
Chinsky
1417f4f40b
Merge pull request #11344 from Hubblenaut/tape
...
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
Chinsky
4ae1a45017
Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows
...
Crescent windows are now near indestructible.
2015-11-02 00:08:52 +03:00
PsiOmegaDelta
a9f7b3a325
Merge pull request #11247 from Hubblenaut/laundry
...
Adds laundry basket
2015-10-31 11:16:14 +01:00
PsiOmegaDelta
7c7ed0f3fc
Crescent windows are now indestructible.
2015-10-28 09:25:12 +01:00
Mark9013100
9b9bcff9de
Brings back the Ausop helmets added in one of my earlier PRs.
...
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
Hubblenaut
ef591fa2b3
Atmos personal locker spawn with atmos tape roll
2015-10-22 14:31:07 +02: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
Mark9013100
a2c8e3ee10
Minor edits to the sec lockers
...
Conflicts:
maps/colony-1.dmm
2015-10-11 00:45:22 -04:00
Mark9013100
1273a51f83
Merges f-card box and evidence bag box
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2015-10-11 00:41:46 -04:00
Datraen
d0bd6b8857
[BUG FIX] Wardrobe
...
Socks are now able to be changed from the wardrobe
2015-10-11 00:40:54 -04:00
SinTwo
4129b95f4e
TG_PORT_fix 2
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/suits/miscellaneous.dm
2015-10-11 00:36:50 -04:00
SinTwo
a2b24d64b7
TG_Port_2
...
Conflicts:
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
code/modules/client/preferences_gear.dm
code/modules/clothing/under/accessories/accessory.dm
2015-10-11 00:36:13 -04:00
Mark9013100
2d709e7862
Flares now spawn in sec lockers
2015-10-11 00:28:47 -04:00
Jon
9f2ec9c163
Adds three new hair flower pins - yellow, blue, and pink.
...
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
Neerti
bbe8c336b2
Adds socks.
...
Conflicts:
code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -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
Hubblenaut
8f7d108831
Ctrl+Click deflates inflatables
2015-10-04 15:56:45 +02: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
