Commit Graph

26514 Commits

Author SHA1 Message Date
c0
44c1917de2 One symbol fix 2016-04-29 13:48:36 +03:00
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
034500f622 Merge pull request #17188 from phil235/FixClosetStuffing
Fixes weird shit happening when clickdragging things from your
2016-04-28 23:49:34 -05:00
Cheridan
167d743bcd Merge pull request #17183 from Shadowlight213/Tickcheck
Adds var to disable Tick checking in the MC for subsystems.
2016-04-28 23:38:21 -05:00
Jordie
fdb1a1db2d Merge pull request #17151 from optimumtact/wakemeup
Add multiple option to ceiling
2016-04-29 14:30:21 +10:00
Cheridan
1e800a04b4 Merge pull request #17186 from phil235/FixMisterSlotFlag
Fixes the backpack watertank's water mister spray being equippable on…
2016-04-28 23:24:45 -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
f8f8008a09 Merge pull request #17189 from MrStonedOne/patch-190
Fixes the mc not running paused dwait systems properly
2016-04-28 22:27:54 -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
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
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
Nerd Lord
3c2f41c8d2 dreamstation maps 2016-04-28 10:34:33 -04:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
Shadowlight213
f03d8f9b1a Changes to pause proc 2016-04-27 23:11:20 -07: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
Kyle Spier-Swenson
60650b82a5 I should also add the check to here. 2016-04-27 17:13:46 -07:00
Kyle Spier-Swenson
a7a32f3d69 Fixes the mc not running paused dwait systems properly
Basically, when atmos (or another dwait subsystem) pauses as it runs to the end of a tick, its suppose to be ran again next mc tick as long as nothing else needs to run. (non-dwait subsystems run next tick regardless, rather than checking for other subsystems first)

The issue is the mc won't run it again, because it was ran less then 75% of SS.wait ago. (a safety I added to prevent lag compounding from trying to make up missed ticks caused by, back in august)

This fixes that, and fixes another issue where if say atmos takes 3ds to process everything, it's next process would be in 5 ds, not 2 ds like it's suppose to be.
2016-04-27 17:09:42 -07:00
phil235
fb93f88fca Fixes weird shit happening when clickdragging things from your inventory into a closet to stuff it in. You can now only stuff mobs and items into closet, and you cannot stuff things that are inside something (mostly your inventory). 2016-04-28 01:45:44 +02: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
bb9c99207d Fixes the backpack watertank's water mister spray being equippable on the belt when it shouldn't 2016-04-28 00:47:53 +02: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
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
Shadowlight213
1ad3b440ff Adds var to disable Tick checking in the MC for subsystems. 2016-04-27 14:04:45 -07:00
Razharas
efa60f8587 Fixes BoHs
Fixes BoHs
fix https://github.com/tgstation/-tg-station/issues/17173
2016-04-27 21:33:36 +03: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
Cheridan
1aa9a61e9e Merge pull request #17171 from phil235/AtmosFiixx
Fixes the air subsystem initialization.
2016-04-27 12:37:00 -05:00
phil235
b2a04afd39 Fixes the air subsystem initialization. 2016-04-27 19:28:13 +02:00
KorPhaeron
ccb24e80c1 Merge pull request #17167 from phil235/AbstractFix
You can attack with ABSTRACT items again.
2016-04-27 12:03:23 -05:00
Jack Edge
6af0e2a0dc Cargo shuttle now arrives in 2 minutes 2016-04-27 17:35:34 +01:00
phil235
61c037389e You can attack with ABSTRACT items again. 2016-04-27 17:45:56 +02: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
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