Commit Graph

12759 Commits

Author SHA1 Message Date
Cerebulon
15cac2752b Moved spritesheet code to base mask item. Fixed captain's helmet. Cleaned up all duplicate/misnamed rig helmets. 2017-04-19 23:52:52 +01:00
Cerebulon
dd3ed474fe Added code for effected mask sprites, fixed remainder of mask sprites. 2017-04-19 04:31:25 +01:00
Anewbe
075cc0dde4 Merge pull request #3324 from VOREStation/port-bay-multiz-fixes
Ports a few fixes to multi-z and related code from Bay
2017-04-18 14:20:16 -05:00
Anewbe
55d895aa14 Merge pull request #3327 from Atermonera/Translator_Languages
Fixes a runtime with borgs and translators
2017-04-17 23:25:01 -05:00
Atermonera
e5e5c446a6 Fixes a runtime with borgs and translators 2017-04-17 21:01:42 -07:00
Neerti
b551a30f3c Merge pull request #3319 from VOREStation/zero-pressure-water
Fix lung rupture while drowning in water.
2017-04-17 22:56:14 -04:00
Neerti
2980e31583 Merge pull request #3321 from Yoshax/iamthehumantorch
No longer shall ye burn from water
2017-04-17 22:48:52 -04:00
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Yoshax
b6fb86cd95 Does what ze captain wants 2017-04-17 18:43:31 +01:00
Leshana
ff3c5238aa De-snowflake thrown objects hitting turfs.
* Port of https://github.com/Baystation12/Baystation12/pull/16942
* Actually tell turfs when a thrown object hits them, and let them decide what to do about it!
  * We do this by calling hitby(), which is how it already works for obj and mob, so this makes behavior consistent.
* This allows us to cleanly solve the problem of a thrown object landing on open space without falling.
2017-04-17 13:13:40 -04:00
MagmaRam
cec43bf3d2 Updates in-game EVA manual 2017-04-17 11:19:39 -05:00
Yoshax
1c000715dd No longer shall ye burn from water 2017-04-17 15:29:08 +01:00
Leshana
a118aad7b3 Fix lung rupture while drowning in water.
* When water returned null from return_air_for_internal_lifeform() the life code treats that as vacuum.  Instead we must return a mixture containing at least some gas.
* It will attempt to use the exhale type for the species, or fall back to carbon_dioxide if it can't find that info.
2017-04-17 00:26:19 -04:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting
Port tg/paradise/goon soft-edge lighting
2017-04-15 22:52:42 -05:00
Anewbe
e455aba104 Merge pull request #3254 from Anewbe/wallets
Wallets can now hold permits.
2017-04-15 18:43:17 -05:00
Anewbe
91bec124b8 Merge pull request #3292 from Neerti/4/13/2017_shields
Changes Shields
2017-04-14 23:47:23 -05:00
Anewbe
4a203c6559 Merge pull request #3304 from VOREStation/aro-pol-wingrille
Make wingrille spawners usable
2017-04-14 23:46:20 -05:00
Arokha Sieyes
c93836745f Make wingrille spawners usable
Makes the spawner object itself block air and prevent active edges before the game starts, so you can actually use these in maps now without creating tons of active edge warnings and making ZAS zones merge everywhere. Should save a loooot of time for mappers picking those window directions.
2017-04-14 21:35:49 -04:00
Anewbe
8142c8baa4 Merge pull request #3272 from LorenLuke/PDA-ID
Can remove ID from PDA via Alt-Clicking now.
2017-04-14 17:51:42 -05:00
Neerti
cc64f0e537 Merge pull request #3255 from Anewbe/bartender_weapon_permit
Gives the bartender a weapon permit in their spawned item list
2017-04-14 01:04:19 -04:00
Neerti
770f3d4ab5 Merge pull request #3290 from Anewbe/antag_infections
Ling and Technomancer now have ways to cure infections
2017-04-14 01:02:11 -04:00
Yoshax
91e060621d Fixes scrubber Phoron scrubbing 2017-04-13 22:32:40 +01:00
LorenLuke
26c3653aec Changes most '<<' to 'to_chat()' 2017-04-13 12:46:04 -07:00
Neerti
c84ab67fd3 Changes Shields
See PR for details
2017-04-13 00:36:13 -04:00
Anewbe
d1657e23c2 Ling and Technomancer now have ways to cure infections 2017-04-12 19:15:32 -05:00
Leshana
f2956464b8 Replace direct access of lighting overlays with T.get_lumcount() 2017-04-12 19:11:53 -04:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
2017-04-12 19:11:45 -04:00
Anewbe
95aff3ae40 Tweaks the message given when a weapon dulls 2017-04-12 16:22:17 -05:00
Anewbe
21d833746d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-12 16:10:58 -05:00
Leshana
45058136e2 Replace opacity = X with set_opacity(X) so that the lighting system can update propertly. 2017-04-11 22:36:48 -04:00
Neerti
920ad74e42 Merge pull request #3279 from Anewbe/borg_cuffs
Should fix borg handcuffs
2017-04-11 21:54:56 -04:00
Anewbe
fcc33c7816 Merge pull request #3282 from VOREStation/aro-pol-morenet
Another e-net tweak
2017-04-11 20:12:30 -05:00
Arokha Sieyes
7e69bafa53 Another e-net tweak
Exploit where if you started breaking the net from the OUTSIDE, even if pulled away from you, you could break it. Adds a target to the do_after.
2017-04-11 21:03:09 -04:00
Anewbe
fc8c32ea92 Should fix borg handcuffs 2017-04-11 13:12:17 -05:00
LorenLuke
faf85774b5 Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate. 2017-04-11 01:16:03 -07:00
LorenLuke
031e63dd7b Can remove ID via Alt-Clicking now. 2017-04-11 00:06:40 -07:00
Leshana
249b5a904b Fix step_trigger teleporters to use forceMove()
* They previously just updated your coordinates, skipping all those things which forceMove() was invented for and causing all the same problems that mob.loc = X caused.
2017-04-10 13:02:47 -04:00
Anewbe
6a99123f51 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-10 11:26:09 -05:00
Anewbe
736659637f Gives the bartender a weapon permit in their spawned item list. 2017-04-09 14:22:15 -05:00
Anewbe
2f4a788a39 Wallets can now hold permits. 2017-04-09 12:59:47 -05:00
Anewbe
6c169e7ad6 Adds in an Unathi-made jerky snack 2017-04-07 23:36:22 -05:00
Neerti
42d07f67ec Merge pull request #3003 from Anewbe/cosmetic_things
Ports a bunch of fluff stuff
2017-04-07 17:30:12 -04:00
Neerti
6dbceb9725 Merge pull request #3232 from Anewbe/shrieks
Changeling shrieks now make them decloak
2017-04-07 17:16:37 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Belsima
ef555990c0 Gives renegade the LeMat. 2017-04-07 07:35:09 -04:00
Neerti
79a932e559 Merge pull request #3228 from Anewbe/package_bombs
Package bomb changes
2017-04-05 22:36:37 -04:00
Anewbe
5e303ab9ad Changeling shrieks now make them decloak 2017-04-05 20:53:24 -05:00
Anewbe
584fd3ed30 Missed a test var 2017-04-04 22:38:07 -05:00
Anewbe
40617b7695 Package bomb changes 2017-04-04 22:36:08 -05:00