Commit Graph

6322 Commits

Author SHA1 Message Date
Fox McCloud
61eff3aa1f Merge pull request #7051 from SamHPurp/light-cigs-with-fireballs
Enables lighting cigarettes with Wands of Fireball
2017-04-05 19:11:34 -04:00
Sam
4fc96b7d21 Wizards always succeed
By request of Fox.
2017-04-05 00:59:04 +01:00
Sam
89f10e834c boom 2017-04-04 23:46:55 +01:00
Fox-McCloud
8fb17b2bee moarrr 2017-04-04 04:26:53 -04:00
Fox-McCloud
9a20311152 better QDEL_NULL 2017-04-04 00:35:42 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04:00
Crazy Lemon
de8c504a19 Merge pull request #6910 from SamHPurp/spawner-map-utilities
Adds tools for mappers
2017-04-03 01:14:16 -07:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Fox McCloud
f83b48f26a Merge pull request #6997 from Crazylemon64/ghostbeacon_rerouting
Allows rerouting of ghost beacons
2017-04-01 17:46:22 -04:00
Fox McCloud
7668c79e7c Merge pull request #7006 from KasparoVy/windowner
Window Corridor Thrown Objects Fix
2017-04-01 17:39:28 -04:00
Fox-McCloud
5c24029a8a baton 2017-04-01 08:40:03 -04:00
KasparoVy
3aa4cefad8 Window Corridor Thrown Objects Fix
Thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.
2017-03-31 04:50:56 -04:00
Crazy Lemon
8cf82bcb7a Merge pull request #6937 from Fox-McCloud/autopsy
Autopsies No Longer Need Surgery
2017-03-30 18:36:21 -07:00
Crazy Lemon
9c233a676d Merge pull request #6865 from Fox-McCloud/receiverssss
Adds Modular Receivers to Loot Table and Hacked Autolathes
2017-03-30 18:32:32 -07:00
Fox McCloud
f821749086 Merge pull request #6777 from uraniummeltdown/tesla
Tesla Grilles
2017-03-30 21:24:21 -04:00
davipatury
1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
Crazylemon64
2165d5db6f Allows rerouting of ghost beacons 2017-03-30 03:16:06 -07:00
Fox-McCloud
50051ee851 Garbage Collection and Code Cleanup 2017-03-27 18:37:44 -04:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
b91fbe264e effect/glowshroom to structure/glowshroom 2017-03-27 18:52:19 -03:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03:00
Sam
04e6cd55bc Adds fungus, oil, cobweb, dirt spawners 2017-03-27 22:12:13 +01:00
Fox McCloud
4d18372353 Merge pull request #6925 from SamHPurp/fixes-abductors
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
2017-03-27 04:33:30 -04:00
Sam
54de887b6c Removing superfluous override 2017-03-27 09:14:24 +01:00
Sam
8bdd31c4c2 Latest batch of fixes - bad ❄️ 2017-03-27 09:01:36 +01:00
Crazy Lemon
09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Sam
8965ba9872 Misc grammatical fixes
Adds message to let people know when you're trying to yank out objects
from them
2017-03-27 06:16:24 +01:00
Sam
db4603d2b4 ANALYSERS CLUNK AGAIN 🎉 2017-03-27 04:41:52 +01:00
Sam
bbd453c038 Addresses Tigercats concerns pulls messages inline 2017-03-27 04:23:02 +01:00
Sam
7dc3b9388b Resolves Fox's concerns (Hopefully) 2017-03-27 04:10:57 +01:00
Sam
4958b0a7d2 Fixes DNA Scrambling IPCs 2017-03-27 03:46:39 +01:00
Fox McCloud
9102a40579 Merge pull request #6933 from Ty-Omaha/Fixes17
Fixes grammar issue when applying splints
2017-03-26 19:08:17 -04:00
Fox McCloud
88ae43709f Merge pull request #6913 from SamHPurp/Unlocked-APCs
Quality of Life: Newly built APCs come unlocked.
2017-03-26 18:24:10 -04:00
Sam
0b7a95933c Refactors bed/chair/stool deconstruction + more
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
2017-03-26 15:50:49 +01:00
Sam
fbd7edd7f3 Comment following discussion 2017-03-26 06:59:50 +01:00
Fox-McCloud
4137f237d7 Autopsies No Longer Need Surgery 2017-03-26 00:31:50 -04:00
Ty-Omaha
b0d8c819e6 Swaps them 2017-03-25 14:26:27 -04:00
Sam
4987aac15c Wooden chairs break into wood not metal 2017-03-25 02:29:58 +00:00
Fox McCloud
bce6befcd1 Merge pull request #6770 from KasparoVy/tools-inhands
Fixes and Adds some Inhand Icons for Tools, TG Tool Inhand Sprite Parity
2017-03-24 19:00:34 -04:00
Fox McCloud
456b1ad6a6 Merge pull request #6795 from uraniummeltdown/silver
Plain and Fancy Gold and Silver Tiles
2017-03-24 18:58:09 -04:00
Sam
dba6c293c7 Increases the number of construction permits 2017-03-24 21:26:38 +00:00
Fox-McCloud
182dcd93b5 autolathe receivers 2017-03-24 16:57:25 -04:00
Fox-McCloud
1933d0d597 Merge remote-tracking branch 'upstream/master' into receiverssss 2017-03-24 16:50:57 -04:00
Sam
4b9ff275b8 Adds additional mapping tools 2017-03-24 13:25:04 +00:00
uraniummeltdown
4762c96779 fixed metal rods max amount error, added old gold tile sprites, added recipes for gold and silver tiles to change them into fancy versions 2017-03-24 14:10:17 +04:00
Fox-McCloud
9ed89ef7cd Fixes Stack Merge Oddities 2017-03-24 04:44:04 -04:00
Crazy Lemon
87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Fox McCloud
b0dc4ccab2 Merge pull request #6738 from uraniummeltdown/shadowshroom
Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf
2017-03-23 12:39:36 -04:00
uraniummeltdown
0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
Fox McCloud
d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00