Commit Graph

2558 Commits

Author SHA1 Message Date
Krausus
4572ad6af4 Fixes matchboxes lacking storage limitations 2017-04-16 22:53:03 -04:00
Fox McCloud
e9156ef71b Merge pull request #7036 from FlattestGuitar/desolate-fluff
Adds a fluff item for DesolateG 👌
2017-04-11 19:52:14 -04:00
Fox McCloud
0edc5400b3 Merge pull request #7080 from SamHPurp/loyalty-to-mindshield
Refactors any remaining Loyalty references to Mindshield
2017-04-11 19:50:59 -04:00
FlattestGuitar
c73eb10c1b Adds a fluff item for DesolateG 2017-04-12 00:41:20 +02:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525 Merge pull request #6894 from Fox-McCloud/abductor-hearts
Abductor Gland Rework and Abductor Updates
2017-04-09 13:40:01 -07:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Fox-McCloud
d07f49433a oh, this is what you meant.... 2017-04-06 06:38:28 -04:00
Fox-McCloud
ec223e040e fixes 2017-04-06 06:37:18 -04: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
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
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Fox-McCloud
5c24029a8a baton 2017-04-01 08:40:03 -04: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
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
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
Fox-McCloud
a8ac39860b abductor update 2017-03-25 20:01:57 -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
Sam
dba6c293c7 Increases the number of construction permits 2017-03-24 21:26:38 +00: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
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
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
KasparoVy
cdc07fac4a Also fixes red crowbar's inhands being the wrong one. 2017-03-14 16:16:37 -04:00
Crazy Lemon
661939c145 Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Fox McCloud
3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
uraniummeltdown
dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Fox McCloud
9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00