Commit Graph

9805 Commits

Author SHA1 Message Date
ZomgPonies
55eeaf24bb Merge pull request #1257 from Krausus/StaticIonLaws
Re-Implements Static Ion Laws
2015-06-06 08:17:46 -04:00
Fox-McCloud
7ae9ec41a0 Merge remote-tracking branch 'upstream/master' into lootdrop 2015-06-05 18:10:30 -04:00
ZomgPonies
fd2dce684f Merge pull request #1159 from tigercat2000/MetaStationPort
MetaStation V41A II port
2015-06-05 17:49:13 -04:00
Krausus
9916142b4c Re-implements static ion laws
Also fixes a minor typo in the randomized laws
2015-06-05 06:16:54 -04:00
Tigercat2000
74f304e88c Metastation: Compatibility modifications
This commit modifies metastation to actually be playable on our code
Squashed Commits:
 - [META] Fixes emergency shuttle being stuck
 - Toxins Mixing fix: chamber floor > engine
 - Adds research outpost + Chem lab to routpost
 - Add vox raider ship, fix pods and a few shuttle zones.
 - Remove step_x so TRAVIS likes it
 - Finish spawn points, add telepad.

 - Replace showroom with NT-rep/Blueshield Office
   Don't worry, the nuke keg is in the meeting room.
 - Convert art storage to barber shop, place artvend in tool storage
 - Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
   minor balance changes.
 - Add Mr. Changs to dorms
 - Update meta to latest paracode
 - Fix punpun
 - Atmos volume pumps, atmos control console
 - Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
 - Fix mr. changs statue and chairs
 - Add togglable polarized windows to surgery, so surgeons can prevent seeing
   other surgery procedures if necessary
 - Actually add atmos control comp
 - Hydro trays are no longer dirt
 - Fix brig windoors
 - Fix escape shuttle sleepers
2015-06-04 19:28:45 -07:00
Fox-McCloud
7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
Fox-McCloud
b6ee1342e9 Redoes the Ion Storm Event and Toy AI 2015-06-04 00:06:16 -04:00
ZomgPonies
5a0ffcf3bf Merge pull request #1238 from Fox-McCloud/stun-fix
Fixes Stuns (Dropping Items or lack there of).
2015-06-01 19:43:22 -04:00
ZomgPonies
767a289a70 Merge pull request #1241 from tigercat2000/0c5f8ac319a2209aecfb475587e28958
Fix species ventcrawl var not working
2015-06-01 15:38:29 -04:00
ZomgPonies
12aad61ae4 Merge pull request #1240 from tigercat2000/dfc3c4e9aad5292ed3ff655785b59dfe
Port -tg- shuffle helper proc
2015-06-01 15:21:22 -04:00
ZomgPonies
e641c847d6 Merge pull request #1233 from Fox-McCloud/stun-balance
Stun+Weaken Balancing
2015-06-01 15:20:19 -04:00
Tigercat2000
6522752818 Fix species ventcrawl var not working 2015-06-01 12:15:37 -07:00
Tigercat2000
b1dc47b4df Fix incorrect uses of the shuffle proc.
Even before the -tg- proc port, it didn't do inline modification of the list.
2015-06-01 08:23:31 -07:00
Fox-McCloud
4e4e3c4990 Stun Fix 2015-05-31 20:35:49 -04:00
ZomgPonies
0eb258798d Merge pull request #1225 from Fox-McCloud/spider-balance
Spider Event Balance
2015-05-31 14:18:17 -04:00
Fox-McCloud
e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies
5e884204e4 Merge pull request #1224 from Fox-McCloud/Mob-blob-rebalance
Mob and Blob Damage Rebalance
2015-05-31 02:59:00 -04:00
ZomgPonies
7b146cad8a Merge pull request #1222 from Fox-McCloud/rampant-Brand
Rampant Brand Rework
2015-05-31 02:58:48 -04:00
Tigercat2000
ba646c51a1 Fix being able to throw people while not next to them 2015-05-30 20:30:43 -07:00
Tigercat2000
c861540dbb Fix headbutting. For the 3rd time.
Jeez, I should take some lessons on ACTUALLY FIXING BUGS.
2015-05-30 20:21:40 -07:00
ZomgPonies
e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
TheDZD
bb921b552d Merge pull request #1153 from tigercat2000/BUILDMODEINf
Adds area generators to build mode - Take 2 [DNM]
2015-05-30 09:56:36 -04:00
Fox-McCloud
7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219
Various Minor Fixes
2015-05-30 07:00:48 -04:00
Krausus
8ab18c27d8 Fixes some Stat procs statting to the wrong panel 2015-05-30 06:18:18 -04:00
Krausus
887a4bad03 Fixes corgis consuming food at warp speed
Also fixes a small issue with the code that restores corgi health when
they eat.
2015-05-30 05:48:03 -04:00
Krausus
755467ac20 Fixes examining those with limb stumps/accessories
Limb stumps would show as "He has a limb stump on his limb stump", and
accessories would be lowercased and worded poorly.
2015-05-30 05:35:18 -04:00
Fox-McCloud
767e70f218 Spider Event Balance 2015-05-30 04:36:42 -04:00
Krausus
9f1f0a9cfa Fixes quick-equipped accessories lingering in hands 2015-05-30 04:35:10 -04:00
Fox-McCloud
c7bfba28e4 Mob and Blob Damage Rebalance 2015-05-30 04:13:12 -04:00
Krausus
f13dccd776 Fixes laptop vendors asking for unneeded PINs
Also fixes some minor typos in the HTML generation.
2015-05-30 04:01:30 -04:00
ZomgPonies
f57359069a Merge pull request #1223 from Fox-McCloud/fix-stuff-ok-whatever-fixed-but-why-fine-fixed-anyway
Fixes and Tweaks to Defenses
2015-05-30 02:35:51 -04:00
Fox-McCloud
0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
Fox-McCloud
66b673f1f4 Rampant Brand Rework 2015-05-29 23:05:26 -04:00
ZomgPonies
47ab558908 Merge pull request #1210 from TheDZD/CLICK-CLICK
Adminbooze Crab Proc Uncommenting
2015-05-29 21:44:45 -04:00
TheDZD
5c63a670a6 Merge pull request #1219 from ZomgPonies/piefix
Who needs cream pie logging anyways
2015-05-29 19:15:32 -04:00
ZomgPonies
f8878438af Who needs cream pie logging anyways 2015-05-29 19:09:20 -04:00
TheDZD
d2eb5f0081 Merge pull request #1218 from ZomgPonies/piefix
Small sprite fix
2015-05-29 18:54:48 -04:00
ZomgPonies
f27eef3e48 Small sprite fix 2015-05-29 18:51:16 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies
30a9108282 Merge pull request #1207 from TheDZD/associative-list-varedit-fix
Ports /tg/ varedit improvements
2015-05-29 18:19:49 -04:00
TheDZD
38d3eeaa31 Merge pull request #1206 from ZomgPonies/piecannon
Adds Piecannons to HONKsquad
2015-05-29 17:41:18 -04:00
ZomgPonies
86497ed03f Merge pull request #1200 from tigercat2000/Overflow
Overflow Rerouting System
2015-05-29 12:35:18 -04:00
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Fox-McCloud
42465737ed inherited 2015-05-28 22:41:17 -04:00
Fox-McCloud
8467d4d438 oops 2015-05-28 22:06:32 -04:00
DZD
e2c5c2b4d5 Adminbooze crab proc uncommenting
Uncomments and fixes up the adminboozey GetMad() proc that crabs have.
The only way to call it currently is via atom proccall. It turns a crab
into a furious machine of murder.
2015-05-28 22:04:15 -04:00
ZomgPonies
d14b597934 Merge pull request #1181 from Krausus/NoMoreBorgitis
Reverts Borgification Disorder
2015-05-28 21:27:07 -04:00
Fox-McCloud
46b64986d0 darn you 2015-05-28 20:00:05 -04:00
Fox-McCloud
4990899123 Merge pull request #1188 from tigercat2000/mobsize
-tg- Mob Size & Refactors
2015-05-28 19:19:12 -04:00