Commit Graph

25866 Commits

Author SHA1 Message Date
TrustyGun
022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
TrustyGun
0b3779ab11 removes the cap's flask from spawn code and replaces the one in his office with his new one 2016-04-08 20:11:24 -04:00
TrustyGun
927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
KorPhaeron
6d519c4e26 Merge pull request #16673 from PKPenguin321/fuck-you-goofball
Reverts most of goof's grab nerf
2016-04-08 02:05:21 -05:00
KorPhaeron
3478183cd8 Merge pull request #16624 from TechnoAlchemisto/Better_pickaxes
Makes pickaxe upgrades less horrible and irrelevant.
2016-04-08 01:29:34 -05:00
KorPhaeron
9bf9aa056f Merge pull request #16695 from TechnoAlchemisto/the_steaks_have_never_been_fire
Goliath meat is now unplated, has its own sprite uncooked.
2016-04-07 23:03:41 -05:00
KorPhaeron
7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements
New Engineering Crates, Shuttle Loan fix
2016-04-07 21:28:29 -05:00
Cheridan
694e78ca03 Merge pull request #16566 from Iamgoofball/patch-17
makes fastprocess EVEN FASTER #speed #MrFastOne
2016-04-07 21:28:05 -05:00
KorPhaeron
35399d6d0c Merge pull request #16690 from lzimann/revert-16570-patch-182
Revert "Smooth movement"
2016-04-07 16:41:47 -05:00
Razharas
a8890b264a Merge pull request #16563 from lzimann/lockerfix
Fix a bug with stuffing people into lockers.
2016-04-08 00:00:22 +03:00
Razharas
89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS
Asteroid fixes
2016-04-07 23:52:37 +03:00
Joan Lung
ab129c57c6 Merge pull request #16689 from KorPhaeron/survival_pod
New Survival Pods
2016-04-07 16:03:03 -04:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
AnturK
830f337c66 Merge pull request #16607 from KorPhaeron/mecha3
Mecha Changes
2016-04-07 20:10:01 +02:00
Cheridan
2420e43d1d Merge pull request #16671 from bgobandit/copydocs
Secret documents can now be copied.
2016-04-07 13:00:57 -05:00
KorPhaeron
299a475c67 Fixes thrown deflection chances 2016-04-07 12:51:42 -05:00
AnturK
80eb5833e9 Merge pull request #16470 from KorPhaeron/accelerator
Laser Cannon Changes
2016-04-07 18:51:18 +02:00
KorPhaeron
166cb54a60 Fixes for survival pod, GPS toggling 2016-04-07 11:49:50 -05:00
Cheridan
96bf1d1f74 Merge pull request #16686 from ChangelingRain/medwrench
Adds the Medical Wrench
2016-04-07 11:41:34 -05:00
Joan Lung
7fafdece03 Merge pull request #16656 from Core0verload/patch-1
IV Drip now works with mutantraces reagent blood
2016-04-07 11:15:16 -04:00
TechnoAlchemist
c8bb360fe3 Goliath meat has its own sprite, goliath steaks don't magically generate plates. 2016-04-06 21:15:48 -07:00
c0
8807c26945 Shuttle Loan fix 2016-04-07 03:26:38 +03:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
KorPhaeron
c074a5b673 Mecha Armour Facings 2016-04-06 19:08:56 -05:00
KorPhaeron
2c091aee80 Various Mining Pod Fixes 2016-04-06 17:25:18 -05:00
Leo
ac585e53ec Revert "Smooth movement" 2016-04-06 18:59:56 -03:00
KorPhaeron
f743754ec3 Survival Pod 2016-04-06 15:36:53 -05:00
Remie Richards
b80d9c9285 Adds accreditation for myself because I forgot to and it's fine to credit yourself when it's like a mini-system thing instead of just like one line fixes gosh. 2016-04-06 21:28:01 +01:00
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances
Conflicts:
	code/game/atoms.dm
2016-04-06 21:26:46 +01:00
Kyle Spier-Swenson
91d90c602f fixes trees fucking up atmos. 2016-04-06 12:37:54 -07:00
Cheridan
0c5151a09e Merge pull request #16502 from Robustin/population
Reduces min. pop. for NukeOps and Cult
2016-04-06 13:41:41 -05:00
Cheridan
38b0aa8bab Merge pull request #16570 from MrStonedOne/patch-182
Smooth movement
2016-04-06 13:31:12 -05:00
Cheridan
fe73fc2b58 Merge pull request #16664 from erwgd/PortaseederDesign
Adds portable seed extractor to protolathe designs
2016-04-06 13:23:40 -05:00
AnturK
2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain
Adds on_species_gain proc to human species
2016-04-06 20:18:15 +02:00
AnturK
a09b6819c1 Merge pull request #16662 from MrStonedOne/patch-187
Fixes directional atmos spread blockers (like small windows/windoors)
2016-04-06 20:13:26 +02:00
Nerd Lord
b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04:00
duncathan salt
b279a639a0 adds a compile time warning for atmos bugs with 509 2016-04-06 10:44:29 -06:00
duncathan salt
11966e5508 Merge pull request #16660 from MrStonedOne/patch-186
[ready]Makes SSair's initialize() faster.
2016-04-06 10:39:04 -06:00
KorPhaeron
4d0cc1e0f0 Cannon 2016-04-06 11:37:32 -05:00
KorPhaeron
5e416d2188 Merge pull request #16661 from ChangelingRain/fixkorsshit2k16
Fixes minerals showing up weird with mining scanners
2016-04-06 10:57:31 -05:00
KorPhaeron
c142407115 Merge pull request #16681 from Core0verload/spaceicon
Space, once again, has an icon in map editor
2016-04-06 09:16:20 -05:00
Razharas
d677bc055b Merge pull request #16674 from optimumtact/signspointtono
Keep pixel offsets when changing sign type
2016-04-06 15:06:08 +03:00
MrStonedOne
546148cb33 Makes atmos init much much much much much faster. 2016-04-06 04:25:04 -07:00
c0
3fdca952d2 Space, once again, has an icon in map editor 2016-04-06 12:40:52 +03:00
c0
feb6c6bdf3 Asteroid fixes 2016-04-06 11:39:45 +03:00
Core0verload
4e9db5beac Slimes can now be put in stasis by CO2 2016-04-06 02:25:49 -06:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
2016-04-06 02:15:25 -06:00
Cheridan
3b3bdcdb75 Merge pull request #16640 from KorPhaeron/snow_biome
Fixes snow biome alarm bolting doors in every ruin
2016-04-06 00:21:21 -05:00
Cheridan
3ad85b8171 Merge pull request #16642 from LatD/freegolems
Makes lavaland golem shell name and description better
2016-04-06 00:18:45 -05:00
Cheridan
09db47c94e Merge pull request #16637 from LanCartwright/virosymptomwork
fixes ancient tier bug where stealth 3 advanced viruses were visible …
2016-04-05 23:50:53 -05:00