Commit Graph

3883 Commits

Author SHA1 Message Date
Crazy Lemon
23180656c0 Merge pull request #7050 from Fox-McCloud/autopsy-fix
Fixes+Refactors Autopsy Scanner Printing
2017-04-06 00:04:28 -07:00
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull
Converts Most Destroys to use QDEL_NULL
2017-04-05 23:49:19 -07:00
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
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -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
2205c14b7d Fixes+Refactors Autopsy Scanner Printing 2017-04-04 18:13:35 -04: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
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
5c24029a8a baton 2017-04-01 08:40:03 -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
davipatury
1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
Fox-McCloud
50051ee851 Garbage Collection and Code Cleanup 2017-03-27 18:37:44 -04:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03: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
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
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
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
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
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
d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00
Crazy Lemon
a3df2d2eb5 Merge pull request #6851 from Fox-McCloud/cleaning
Spring Cleaning
2017-03-22 21:16:52 -07:00
FlattestGuitar
c1fcb9a87c < 2017-03-22 09:24:03 +01:00
KasparoVy
eb43a48f67 Resolves conflicts with baseball PR. 2017-03-21 16:16:16 -04:00
Fox-McCloud
037db0bdf7 Spring Cleaning 2017-03-21 14:43:53 -04:00
Fox McCloud
8a257e425e Merge pull request #6789 from uraniummeltdown/playball
Baseball Bats, Baseball Burgers
2017-03-21 14:38:03 -04:00
Fox McCloud
472bd7b887 Merge pull request #6813 from SamHPurp/fixes-vent-text
Fixes
2017-03-20 16:39:10 -04:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam
343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00:00
Sam
db89c499ce Fixes some capitalisation stuff...
Pedantry!
2017-03-19 01:09:47 +00:00
uraniummeltdown
cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
uraniummeltdown
5180002295 add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat 2017-03-16 22:33:24 +04:00
uraniummeltdown
b686cad0ce robo hands aren't affected by shard cutting into hand 2017-03-16 16:20:46 +04:00
uraniummeltdown
6ca139974d glass shards now deal brute to your hand if not wearing gloves 2017-03-15 19:39:54 +04:00