Commit Graph

14530 Commits

Author SHA1 Message Date
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
2016-04-28 22:11:29 -05:00
Joan Lung
5a627c5b66 Merge pull request #17166 from coiax/cargo-crates-1
New cargo crates to buy
2016-04-28 16:33:50 -04:00
Razharas
173ee4a680 Merge pull request #17178 from ChangelingRain/plantdream
Adds plant DNA machine to Dreamstation
2016-04-28 22:50:34 +03:00
TechnoAlchemist
8d27948ed1 moves icons to mining.dmi as to avoid merge conflicts. 2016-04-28 12:21:15 -07:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
2016-04-28 12:03:31 -07:00
Joan Lung
fd8942e70c Adds survival pod windows to the code
* Adds survival pod windows to the code

* Light and dark pod flooring

* looks better
2016-04-28 10:57:39 -06:00
Nerd Lord
3c2f41c8d2 dreamstation maps 2016-04-28 10:34:33 -04:00
Joan Lung
9b3f811113 Merge pull request #17007 from TechnoAlchemisto/beepbeep2
Makes syndicate bombs scarier.
2016-04-27 22:47:06 -04:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz
Some sandbag changes
2016-04-27 20:23:21 -04:00
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
2016-04-28 00:13:15 +02:00
KorPhaeron
cf08028eb0 Merge pull request #17046 from PKPenguin321/krav-sec-warden
Gives krav maga gloves to the warden
2016-04-27 16:09:04 -05:00
Razharas
efa60f8587 Fixes BoHs
Fixes BoHs
fix https://github.com/tgstation/-tg-station/issues/17173
2016-04-27 21:33:36 +03:00
Razharas
88b55ced87 Fixes chameleon projector explosion protection (#17138)
Fixes chameleon projector explosion protection
2016-04-27 17:31:54 +02:00
Razharas
c396cd5be5 Fixes falsewalls being unsmashable (#17135)
* Fixes falsewalls being unsmashable
2016-04-27 17:29:56 +02:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
2016-04-27 10:24:47 -05:00
Jack Edge
fa018861e8 New cargo crates to buy
Also some minor spelling fixes I noticed.

🆑 coiax
tweak: Internals Crate now contains breath masks and small tanks.
rscadd: Metal foam grenade box crate added for 1000 points
rscadd: Added two Engineering Mesons to Engineering Gear Crate
tweak: Engineering Gear now costs 1300
rscadd: Breach Shield Generator Crate added for 2500 points
rscadd: Grounding Rod Crate added for 2500 points
rscadd: PACMAN Generator Crate added for 2500
rscadd: Defibrillator Crate added for 1500
rscadd: Nanotrasen Customs report that some wide band suppliers have
been providing "alternative" firing pins. Nanotrasen reminds all
crewmembers that contraband is contraband.
/🆑

Laser tag firing pins (only allow gun to be fired with laser tag armor
of the appropriate colour) added to contraband.
Special clown firing pin (prank your friends) added to contraband.
2016-04-27 16:20:06 +01:00
Joan Lung
a5fffec3a4 Merge pull request #17137 from Razharas/BoHinBoHFix
Fixes drone or any other boh in boh abuse
2016-04-27 08:45:31 -04:00
Cheridan
3a8fe0913b Merge pull request #17116 from KorPhaeron/lockdown
Lockdown Fix
2016-04-27 02:21:55 -05:00
KorPhaeron
35eecd7cae Merge pull request #17114 from Shadowlight213/Dropdump
Fixes SSU dropping contents on opening
2016-04-26 23:21:46 -05:00
KorPhaeron
12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
PKPenguin321
1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
LatD
12f9d205e8 Syndicate bomb delay wire changed to one time use (#16790)
* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
2016-04-26 23:28:01 +02:00
TechnoAlchemist
926e351fee adds sinew restraints, changes sinew droprate. 2016-04-26 14:10:42 -07:00
Shadowlight213
ad6ff2515b Var stuff 2016-04-26 13:49:35 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
kevinz000
de5a214132 Fixes detection multitool (#17011)
* detectionfix

* unnessacary_things_removal

* Uranges
2016-04-26 19:49:11 +02:00
erwgd
02b29f888a Prevents collapsing roller beds or grabbing chairs whilst incapacitated (#17074)
* added if(usr.incapacitated) for grabbing a chair

* added if(usr.incapacitated()) for collapsing a roller bed
2016-04-26 19:41:21 +02:00
Razharas
534d970567 Fixes drone or any other boh in boh abuse
Fixes drone or any other boh in boh abuse
2016-04-26 15:34:49 +03:00
duncathan salt
bebe046aca Merge pull request #17103 from TheWiznard/malfmodfix
removes a comment from malf modules
2016-04-26 01:12:09 -06:00
KorPhaeron
f39ca0d568 Merge pull request #17131 from tgstation/duncathan-patch-1
fixes watcher sinew origin tech
2016-04-26 01:13:28 -05:00
Cheridan
07f17f8d61 Merge pull request #17111 from tgstation/ruinfix
Should fix the maploader bugs
2016-04-26 01:10:42 -05:00
duncathan salt
0f0aa25976 fixes watcher sinew origin tech 2016-04-25 23:44:06 -06:00
KorPhaeron
5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00
TechnoAlchemist
18e1c7825d bigger 2016-04-25 19:40:51 -07:00
Cheridan
8a90e6a6ff Merge pull request #17113 from Shadowlight213/Doesn'tfixingthisviolatetheruin
Hopefully fixes the sloth ruin atmos runtime.
2016-04-25 21:01:22 -05:00
Cheridan
5485f75bfd Merge pull request #17076 from ChangelingRain/sixtynineblob
Blobbernaut tweaks
2016-04-25 19:28:28 -05:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
phil235
bb1f60e769 Fixes typos and errors I made.
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
TheWiznard
2007a8241d removes comment 2016-04-25 15:21:52 -05:00
KorPhaeron
025b432e8e Lockdown Fix 2016-04-25 13:48:33 -05:00
Shadowlight213
1743138d07 Fixes SSU dropping contents on opening 2016-04-25 11:32:21 -07:00
Shadowlight213
b23d676995 Fixes sloth ruin atmos runtime. 2016-04-25 10:54:45 -07:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
duncathan salt
d7c1328c6f Merge pull request #17110 from tgstation/master
updates my brand new branch cuz i'm an idiot
2016-04-25 09:29:24 -06:00
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
duncathan salt
c2a3ae9424 adds a new argument to ChangeTurf() which allows us to skip calling AfterChange() 2016-04-25 09:24:40 -06:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
Jack Edge
1a6ad107af Refactoring and tweaks 2016-04-25 09:01:52 +01:00
TheWiznard
19a6e140c3 fixes newline error
moves a comment up
2016-04-25 01:55:52 -05:00
Jack Edge
bb4f035fd6 Merge branch 'master' into slaughter-fixes 2016-04-25 07:32:40 +01:00