Commit Graph

15385 Commits

Author SHA1 Message Date
Cheridan
ed53cec0ed Merge pull request #17172 from Robustin/travelmode
RIP TRAVEL MODE, ALL HAIL EVA MODE
2016-04-29 00:17:38 -05:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
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
Jack Edge
b21bc9ad96 Die commas die 2016-04-28 21:24:30 +01:00
Jack Edge
70e59d729f Increases cargo shuttle time back to two minutes 2016-04-28 20:11:52 +01: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
Razharas
daf01d872e Merge pull request #17157 from Core0verload/botany_nerf_II
Nerfs botany slippery-everything
2016-04-28 18:21:09 +03:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz
Some sandbag changes
2016-04-27 20:23:21 -04:00
Joan Lung
d9bc4e0040 Merge pull request #16914 from MrStonedOne/clientversionconfig
Adds a config for client versions
2016-04-27 19:29:11 -04:00
phil235
8a9422e45f derp, copypasta error 2016-04-28 00:24:50 +02: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
44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom
Charger holoparasites now shake the target's camera
2016-04-27 13:24:54 -05:00
Cheridan
eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant
Fixes jetpack implant speed boost inconsistency.
2016-04-27 13:13:28 -05:00
Robustin
201abb0323 GudChange 2016-04-27 14:01:57 -04:00
Cheridan
3a91fab55c Merge pull request #17163 from phil235/ImprinterFix
Imprinter fix
2016-04-27 12:41:16 -05:00
Jack Edge
6af0e2a0dc Cargo shuttle now arrives in 2 minutes 2016-04-27 17:35:34 +01: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
phil235
33d84ef73f Fixes inserting reagents in RnD machines 2016-04-27 13:05:13 +02:00
phil235
9657f328ec Fixes Reagent insertion in RnD machines 2016-04-27 13:04:05 +02:00
phil235
f4f09704eb fixes not being able to pour reagents in circuit imprinter/protolathe 2016-04-27 13:03:19 +02:00
bawhoppen
fa7158e860 fixed it 2016-04-27 04:35:59 -05:00
Cheridan
e6509ddd23 Merge pull request #17115 from KorPhaeron/gun_fix
[S] Fixes minigun bugs
2016-04-27 02:52:22 -05:00
KorPhaeron
39c1af5792 Merge pull request #17147 from TechnoAlchemisto/skullhelm
Adds craftable skull helmet.
2016-04-26 23:56:34 -05:00
KorPhaeron
72c10bef00 Merge pull request #17132 from tgstation/duncathan-patch-1
processor overload requires 20 players
2016-04-26 23:22:59 -05:00
c0
8a31634cab Nerfs botany slippery-everything 2016-04-27 06:34:11 +03: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
TechnoAlchemist
0a8da62457 adds primal category to stop clutter in cat_misc. 2016-04-26 16:34:54 -07:00
phil235
dc730e9b5b Fixes typo making the destructive analyzer always be busy. 2016-04-27 01:00:39 +02:00
TechnoAlchemist
926e351fee adds sinew restraints, changes sinew droprate. 2016-04-26 14:10:42 -07:00
TechnoAlchemist
5b19023f24 adds skull helmet. 2016-04-26 13:35:00 -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
phil235
b7da04e8c8 You can now use your PDA on the emergency shuttle console. 2016-04-26 21:43:11 +02:00
KorPhaeron
2bc85f6e9e Merge pull request #17134 from Zuvassin/fortheskullthrone
Adds champion armour to necro chests
2016-04-26 12:51:05 -05:00
Nerd Lord
fe0f4e2ad0 Charger holoparasites now shake the target's camera 2016-04-26 11:22:22 -04:00
KorPhaeron
b8c6e93b29 Merge pull request #16732 from Iamgoofball/patch-22
Fluorosulfuric SACid
2016-04-26 05:13:09 -05:00
bawhoppen
deef852516 phil's suggestion 2016-04-26 05:06:01 -05:00
Zuvassin
dadae277cb Adds champion armour to necro chests 2016-04-26 18:55:31 +10:00
Kyle Spier-Swenson
c3bcf0adfc Adds a download link. 2016-04-26 01:43:48 -07:00
duncathan salt
62688574bc processor overload requires 20 players 2016-04-26 01:05:15 -06:00
KorPhaeron
08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers
Adds craftable bracers, adds watchers dropping bones.
2016-04-26 01:39:50 -05:00
KorPhaeron
c1987f699a Merge pull request #17093 from RandomMarine/cockroach
Drones stop squishing cockroaches.
2016-04-26 01:17:40 -05:00
Cheridan
07f17f8d61 Merge pull request #17111 from tgstation/ruinfix
Should fix the maploader bugs
2016-04-26 01:10:42 -05:00
TechnoAlchemist
930f49589d nerfs bracers :( 2016-04-25 21:01:31 -07:00
KorPhaeron
5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00
TechnoAlchemist
98030c8480 """"""""Design Lead""""""""""" 2016-04-25 16:51:09 -07:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00