Commit Graph

3880 Commits

Author SHA1 Message Date
deathride58
e0837a45b6 basic config stuff 2017-09-19 20:29:03 -04:00
deathride58
d2ffa0def6 fixed. 100% fixed. i hope. 2017-09-17 01:20:29 -04:00
deathride58
428a416447 friendly reminder that mekhi anderson belongs on the table 2017-09-17 01:10:12 -04:00
deathride58
e20d45f3d5 how is this intuitive in any way, shape, or form 2017-09-17 00:47:14 -04:00
deathride58
e8c7cb4f51 there we go 2017-09-17 00:35:03 -04:00
deathride58
a10f27ff14 runtime nerfs 2017-09-16 23:44:39 -04:00
deathride58
9676b9f26d places the cat firmly on a table 2017-09-16 23:18:57 -04:00
deathride58
c4e3b778b3 Merge branch 'master' into crewobjectivesandmiscreants 2017-09-17 02:26:07 +00:00
CitadelStationBot
a9d42c9051 [MIRROR] Fix clothing crafting menu for realsies this time (#2812)
* Fix clothing crafting menu for realsies (#30776)

* Fix clothing crafting menu for realsies this time
2017-09-16 20:25:42 -05:00
Poojawa
ad7c927208 Update mutations.dm 2017-09-16 10:44:22 -05:00
Poojawa
71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
Poojawa
15db46af10 Update dogborgstuff.dm
removes PAI from protected, add bomb cores. christ people are memes.
2017-09-16 08:22:50 -05:00
CitadelStationBot
d2db21dbdf [MIRROR] Ninja adrenaline boost removes stamina damage (#2783)
* Merge pull request #30704 from YPOQ/boost

Ninja adrenaline boost removes stamina damage

* Ninja adrenaline boost removes stamina damage
2017-09-16 04:46:41 -05:00
Poojawa
29c116f491 disables genetics-aquireable hulk until nerfed 2017-09-16 04:43:54 -05:00
CitadelStationBot
e4af04823a [MIRROR] Fix pressure plate spam (#2775)
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
2017-09-16 04:35:45 -05:00
CitadelStationBot
956efbef27 [MIRROR] Removes corgis as a facehugger target (#2791)
* Removes corgis as a facehugger target (#30719)

* Removes corgis as a facehugger target
2017-09-16 04:33:16 -05:00
CitadelStationBot
1db4249fa1 [MIRROR] Adds Abandoned Airlocks (#2784)
* Adds Abandoned Airlocks (#30705)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Abandoned Airlocks

* Added to maps

* inclusive numbering

* Update airlock.dm

* Tweaks

* Capital ChangeTurf

* Update airlock.dm

* no more update_icons

* Abandoned paths (#4)

* Abandoned paths

* Cleaned up dirty var

* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
CitadelStationBot
a91f7efe5e [MIRROR] Fixes the doomsday device announcements (#2789)
* Fixes the doomsday device announcements

* Fixes the doomsday device announcements
2017-09-16 04:31:46 -05:00
CitadelStationBot
ccd55bb779 [MIRROR] Remove /obj/proc/gang_contraband_value (#2799)
* Remove /obj/proc/gang_contraband_value() (#30744)

unused

* Remove /obj/proc/gang_contraband_value
2017-09-16 04:31:22 -05:00
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
CitadelStationBot
119828bb59 [MIRROR] Fixes get_area not working on areas (#2788)
* Fixes get_area not working on areas

* Fixes get_area not working on areas
2017-09-15 05:52:39 -05:00
CitadelStationBot
ca2665a128 [MIRROR] gives the krebs a new sprite (#2761)
* gives the krebs a new sprite

* Update crab.dm
2017-09-15 03:35:56 -05:00
CitadelStationBot
40a34e2a63 [MIRROR] Fixes evidence bags showing ghost contents after their contents get deleted (#2782)
* Merge pull request #30702 from vuonojenmustaturska/evidencebags

Fixes evidence bags showing ghost contents after their contents get deleted

* Fixes evidence bags showing ghost contents after their contents get deleted
2017-09-15 03:35:29 -05:00
CitadelStationBot
941f63e7f9 [MIRROR] Adds a tip to examine for L6 SAW machinegun (#2779)
* Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that

Adds a tip to examine for L6 SAW machinegun

* Adds a tip to examine for L6 SAW machinegun
2017-09-15 03:34:15 -05:00
CitadelStationBot
4dffe75a30 [MIRROR] Syndicate Borgs now show up as Syndicate Borgs in Check Antags (#2781)
* Merge pull request #30713 from ExcessiveUseOfCobblestone/patch-3

Syndicate Borgs now show up as Syndicate Borgs in Check Antags

* Syndicate Borgs now show up as Syndicate Borgs in Check Antags
2017-09-15 03:33:50 -05:00
CitadelStationBot
79ae8d8829 [MIRROR] Ports chasm exceptions to typecaches (#2777)
* Ports chasm exceptions to typecaches (#30717)

* Ports chasm exceptions to typecaches

* Ports chasm exceptions to typecaches
2017-09-15 03:24:57 -05:00
CitadelStationBot
574c967f87 [MIRROR] Fix crafting menu runtime (#2778)
* Merge pull request #30712 from pubby/craftingfix

Fix crafting menu runtime

* Fix crafting menu runtime
2017-09-15 03:24:13 -05:00
CitadelStationBot
c4e6642530 [MIRROR] Stops dead monkeys from moving (#2780)
* Merge pull request #30709 from vuonojenmustaturska/hisgrace

Stops dead monkeys from moving

* Stops dead monkeys from moving
2017-09-15 03:23:40 -05:00
CitadelStationBot
b5dc828756 [MIRROR] Procedurally generated Gondolas. (#2786)
* Procedurally generated Gondolas. (#30700)

* Adds Gondoland and the rare Gondolas

* at the end of history

* /lizard >>> /gondola

* expand GOND

* for cyberboss he wants it in TGM

* thicc health

* thiccer health

* Procedurally generated Gondolas

* Procedurally generated Gondolas

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Procedurally generated Gondolas.
2017-09-15 03:22:19 -05:00
CitadelStationBot
af0080b00b [MIRROR] Stops ranged stack splitting (#2785)
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
2017-09-15 02:51:53 -05:00
Poojawa
8a2ec7d39a Update radiation_storm.dm 2017-09-14 13:32:48 -05:00
CitadelStationBot
f07369aead [MIRROR] Fixes nuking the syndicate base (#2767)
* Merge pull request #30694 from KorPhaeron/syndie_nuke

Fixes nuking the syndicate base

* Fixes nuking the syndicate base
2017-09-14 13:24:43 -05:00
CitadelStationBot
7d34286803 [MIRROR] Fixes a bunch of computers (#2766)
* Fixes a bunch of computers (#30693)

* Fixes a bunch of computers
2017-09-14 13:23:01 -05:00
CitadelStationBot
35fc9d0391 [MIRROR] Fixes pAI integrated light (#2764)
* Fixes pAI integrated light (#30690)

* Fixes pAI integrated light
2017-09-14 13:22:27 -05:00
CitadelStationBot
59c7723e01 [MIRROR] Fix screwdrivers showing old cryo pods (#2763)
* Fix screwdrivers showing old cryo pods

* Fix screwdrivers showing old cryo pods
2017-09-14 13:19:38 -05:00
CitadelStationBot
3516f4ef0a [MIRROR] turf now checks for inheritance, this is the future! (#2770)
* Turfs call ..() in attackby (#30707)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* ok this works

* ok this works

* turf now checks for inheritance, this is the future!
2017-09-14 13:18:01 -05:00
CitadelStationBot
9961ecabf1 [MIRROR] More admin auth fixes (#2769)
* More admin auth fixes (#30688)

* More admin auth fixes
2017-09-14 13:17:08 -05:00
CitadelStationBot
d156fecdbf [MIRROR] Fixes skinless species dropping human skin when gibbed (#2735)
* Fixes skinless species dropping human skin when gibbed (#30649)

* fix gibbing skinless species

* = loc -> forceMove(loc)

* oops

* Fixes skinless species dropping human skin when gibbed
2017-09-14 07:52:03 -05:00
CitadelStationBot
d86060dcff [MIRROR] Lobby music won't be the same as the last round (#2727)
* Merge pull request #30636 from Cyberboss/NoDupeMusic

Lobby music won't be the same as the last round

* Lobby music won't be the same as the last round
2017-09-14 07:51:34 -05:00
CitadelStationBot
c6b9892dc0 [MIRROR] Fixes potted plants putting you above wall objects (#2754)
* Merge pull request #30676 from ShizCalev/plant-layer-fix

Fixes potted plants putting you above wall objects

* Fixes potted plants putting you above wall objects
2017-09-14 07:39:13 -05:00
CitadelStationBot
40f5d7d4bf [MIRROR] Fixes wash_obj misuse (#2753)
* Fixes wash_obj misuse (#30658)

* Fixes wash_obj misuse

* This too

* Ree

* REEEEE

* Fixes wash_obj misuse
2017-09-14 07:38:51 -05:00
CitadelStationBot
c6025a7049 [MIRROR] Adds some TRUE and FALSE (#2751)
* This is not a refactor (#30670)

* Adds some TRUE and FALSE
2017-09-14 07:38:27 -05:00
CitadelStationBot
fc62f8bf3e [MIRROR] Shuttle multi-tile object fix (#2748)
* multi-tile object fix (#30674)

* Shuttle multi-tile object fix
2017-09-14 07:37:54 -05:00
CitadelStationBot
5ed14bfedd [MIRROR] Adds more missing href tokens (#2749)
* Adds more missing href tokens (#30664)

* Adds more missing href tokens
2017-09-14 07:37:25 -05:00
CitadelStationBot
7dc9ac7e2d [MIRROR] Fixed small error causing signalers to fail to attach to each other in an assembly (#2750)
* Fixed small error in signalers causing signalers to fail to attach to eachother in an assembly (#30675)

* Fixed small error causing signalers to fail to attach to each other in an assembly
2017-09-14 07:36:13 -05:00
CitadelStationBot
82861d208b [MIRROR] Fixes lighting hard deleting (#2760)
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
2017-09-14 06:44:17 -05:00
CitadelStationBot
1051fb4fa7 [MIRROR] Corrects runtime in observer.dm (#2610)
* Corrects runtime in observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm
2017-09-13 22:55:22 -05:00
CitadelStationBot
099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729)
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
2017-09-13 22:54:41 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733)
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
2017-09-13 22:54:12 -05:00
CitadelStationBot
b4c27d5533 [MIRROR] Chainsaws now have a suicide! (#2734)
* Chainsaws now have a suicide! (#30559)

* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep

* Chainsaws now have a suicide!
2017-09-13 22:53:55 -05:00