Commit Graph

28769 Commits

Author SHA1 Message Date
Hatterhat
aa15475ef8 protolathe screen actually updates mat cost
hey, y'know what's really funny? how the protolathe screen can update chemical cost, but not material cost. this fixes that.
2019-01-14 17:52:50 -06:00
Cerebulon
b82244b447 Fixes a couple of tiny glasses bugs 2019-01-14 11:33:24 +00:00
Neerti
7c7829d3e7 Merge pull request #5835 from Cerebulon/ReligionUpdate
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:45:57 -05:00
Neerti
274b3c3c93 Merge pull request #5776 from Atermonera/spacesuit_pressure_limits
Adds pressure protection bounds to clothing.
2019-01-13 02:28:36 -05:00
Neerti
ece6992482 Merge pull request #5820 from Anewbe/ic_issue_response
Makes IC ticket response less rude
2019-01-13 02:26:42 -05:00
Neerti
a44764d308 Merge pull request #5823 from Anewbe/egun_stun
Egun stun beams are weaker
2019-01-13 00:28:35 -05:00
Neerti
88d6b972de Merge pull request #5828 from Cerebulon/traitorFix
Fixes antagonist options not appearing in preferences
2019-01-13 00:28:21 -05:00
kevinz000
9122258d58 dupe 2019-01-12 12:28:03 -08:00
kevinz000
07e5d92ea9 Indentation 2019-01-12 05:53:20 -08:00
kevinz000
61561ade31 Clamp replace 2019-01-12 05:51:08 -08:00
kevinz000
a9aa4110a3 Puts is helpers into their own file 2019-01-12 05:48:05 -08:00
kevinz000
14832ccace Well that took a lot of effort.. 2019-01-12 05:25:00 -08:00
Neerti
3880d13e10 Merge pull request #5815 from Heroman3003/eggnog
Adds eggnog drink to the game.
2019-01-12 04:29:04 -05:00
Neerti
b494f4a508 Merge pull request #5772 from Atermonera/rotate_wires
Refactors poi rotation to use degrees instead of dir
2019-01-12 04:26:23 -05:00
Neerti
2cd2e65530 Merge pull request #5824 from Heroman3003/paint_bucket_fix
Fixes non-black/white paint buckets not actually having paint in them
2019-01-12 04:22:29 -05:00
Neerti
a78d394a91 Merge pull request #5826 from Mechoid/FixFixIronTide
Blob factories now properly remove their listings from mobs when destroyed.
2019-01-12 04:22:11 -05:00
Cerebulon
af0f24eeaf Changelog + renamable icons + typo 2019-01-12 05:58:29 +00:00
Cerebulon
5d601302b7 Religion Overhaul 2019-01-12 05:35:53 +00:00
kevinz000
e9ce0c19ff parenthewhatevers 2019-01-11 11:51:39 -08:00
kevinz000
a9c67fc919 Oh boy! 2019-01-11 11:50:20 -08:00
kevinz000
171843e7b7 Done 2019-01-11 06:40:09 -08:00
kevinz000
c162255529 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-11 04:54:32 -08:00
kevinz000
61fe7e7e7e Stuff 2019-01-11 04:53:23 -08:00
Cerebulon
2c9cd36658 Fixes antagonist options not appearing in preferences 2019-01-11 10:05:08 +00:00
Cerebulon
e6888213de Fixes infinite microwave sound when recipe fails 2019-01-11 09:24:41 +00:00
Mechoid
e13d9a59ea Blob factories now properly remove their listings from mobs when destroyed. 2019-01-10 21:43:31 -08:00
Neerti
1764748f06 Adds ability to put butts in boxes
Specifically cigarette butts in cigarette boxes, and cigar butts in cigar boxes.
2019-01-10 18:43:16 -05:00
Heroman3003
0b291d2cb4 fixes non-black/white paint buckets not actually having paint in them 2019-01-11 08:24:02 +10:00
Neerti
afa149ca2f Adds New PoI Features + Bonus PoI (#5796)
* Adds cliffs.

* Finishes lava and polishes the other things.

* Hopefully finished with all the new shinies.
2019-01-10 16:17:43 -06:00
Anewbe
11ff7b1ca3 Merge pull request #5812 from Verkister/patch-19
Fixes lift and shuttle moves not updating lighting
2019-01-10 15:59:25 -06:00
Anewbe
57cfb7d5ef Egun stun beams are weaker 2019-01-10 15:47:57 -06:00
kevinz000
f3da68481a Ticks stuff, MOVES WORLD DOWN TO CODE/GAME/world.dm, so __defines islist() can work and because it literally would not work on my computer without doing this! 2019-01-10 10:37:51 -08:00
kevinz000
c8a846476b Why does every merge commit break EVERYTHING 2019-01-10 10:30:05 -08:00
kevinz000
7053dbad27 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-10 10:26:59 -08:00
Anewbe
2a362015e4 Makes IC ticket response less rude 2019-01-10 01:29:59 -06:00
Atermonera
073bf1d1ee Merge pull request #5816 from Anewbe/gun_again
Guns should once again let people know that they've been fired
2019-01-09 18:14:23 -08:00
kevinz000
ae64d73972 Upgrades SDQL2 and refactors it to a datum (#5793)
* SDQL2
2019-01-09 18:12:12 -08:00
Neerti
d11f189915 Merge pull request #5811 from Mechoid/FixDopplerSprite
Gives the Doppler Array a sprite again. It still works somehow!
2019-01-09 15:27:22 -05:00
Anewbe
2713ad77f7 Guns should once again let people know that they've been fired 2019-01-07 20:35:39 -06:00
Heroman3003
8b6a62a496 Adds eggnog. 2019-01-08 12:31:42 +10:00
kevinz000
ced118076b Everything should be good! 2019-01-07 03:28:02 -08:00
kevinz000
a9aa961259 Fixes 2019-01-07 01:44:45 -08:00
kevinz000
3cc35a1027 CanPass errors 2019-01-07 00:23:10 -08:00
kevinz000
352383e196 Oh boy 2019-01-06 23:53:57 -08:00
kevinz000
563bb4682e Everything is fucked 2019-01-06 23:37:07 -08:00
kevinz000
1315bfff2c Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-06 23:12:48 -08:00
Spades
81c3036140 Guns sounds refactor and improvements (#5803)
* Gun sound updates

Grenade Launcher sound source:
https://freesound.org/people/LeMudCrab/sounds/163458/

* Actually, this is a better way to handle this.

* Fixed accidental inconsistent indentation

* Renames shotgun.ogg to Gunshot_shotgun.ogg

Also actually changes the file names like I was supposed to last night.

* *peers* Didn't I just fix this shit?

* Actually fixes the missing files this time

* Update audible_deception.dm

* Changed tungsten core projectile sound by request

* Actually no this line is stupid and makes me angry

Simplifies dumb code that was badly copypasted.

Also fixed missing D'eagle fire_sound

* Smarter code

Less copypasta, more runtimes prevented in case somebody decides to make
a soundless gun whether done intentionally or not.

* Update gun.dm
2019-01-06 18:27:24 -08:00
Anewbe
758b077dbb Merge pull request #5790 from Mechoid/Make_Security_Sad
Drop the number of shots of normal and sec-xeno tasers back down to 5.
2019-01-06 16:52:01 -06:00
Anewbe
3c07fa2747 Merge pull request #5806 from Mechoid/HammerSlimeFaction
Fixes #5780
2019-01-06 12:14:09 -06:00
Anewbe
7ac8b8863f Merge pull request #5808 from Ragolution/master
CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
2019-01-06 12:13:42 -06:00