Commit Graph

6813 Commits

Author SHA1 Message Date
Fox-McCloud
6d2a2f3eba tweaks 2015-10-19 17:20:35 -04:00
Aurorablade
1404c88229 fixes
will still need to look at using transfer_to and the language key
2015-10-19 08:27:06 -04:00
Aurorablade
3a2590261b Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2 2015-10-18 21:37:28 -04:00
Fox-McCloud
597108dc40 Say Bubble Refactor+Fix 2015-10-18 18:58:21 -04:00
Fox-McCloud
aabdfc3924 Reagent Scanner/Seeing 2015-10-18 00:44:15 -04:00
Fox-McCloud
8c67b24506 Code Cleanup 2015-10-17 05:58:37 -04:00
Fox McCloud
d6cb0f9075 Merge pull request #2365 from Crazylemon64/apc_autolathe
APC electronics refactor
2015-10-15 16:03:08 -04:00
TheDZD
9d45ee8b81 Merge pull request #2355 from Fox-McCloud/eye-fixes
Eyes Fixes and Chem Tweaks
2015-10-14 18:29:57 -04:00
Fox-McCloud
cd502b6a16 surgeryize me cap'n 2015-10-14 07:05:49 -04:00
Crazylemon
76c648e028 Actually adds the fix I made after the failed compile on my own end 2015-10-13 21:23:22 -07:00
Crazylemon
3c3f51401b Cuts out all the old weapon/module code
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
2015-10-13 21:13:49 -07:00
Aurorablade
d141945b10 Changed based on feedback 2015-10-13 23:01:28 -04:00
TheDZD
dd97cc261d Merge pull request #2343 from Fox-McCloud/game-mode-cleanup
Removes Nations and Unused Gamemodes
2015-10-13 21:34:49 -04:00
TheDZD
cbe21922ef Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing
More Dereferencing
2015-10-12 16:36:14 -04:00
Fox-McCloud
46f9f68f31 more de-referencing 2015-10-12 04:18:49 -04:00
Fox-McCloud
81cfcd7af3 More Dereferencing 2015-10-12 02:37:52 -04:00
Aurorablade
bce376e875 Updating for Pull refactor
I realease a swarmer a day on github until this is merged.
2015-10-11 22:57:18 -04:00
Aurorablade
2b54e5cf63 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2 2015-10-11 22:50:27 -04:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Tigercat2000
a3af2f124e Rigsuit Fixes: ONE LESS SNOWFLAKE 2015-10-11 16:22:07 -07:00
Tigercat2000
8fff9a327a Rigsuit Fixes: WHO DOESN'T LOVE SOME REDUNDANCY UP IN HERE 2015-10-11 15:58:41 -07:00
Crazylemon64
b0b79080b6 Nukes an apostrophe that doesn't play nice 2015-10-11 15:34:03 -07:00
Crazylemon64
68d06bb0e4 Merge branch 'master' into fixes_petsay
Keeping things up to date, to make adding this branch later smooth
2015-10-11 15:26:09 -07:00
Fox McCloud
61dd485323 Merge pull request #2338 from tigercat2000/MONSTER
Turf cleanup, Shoe unsnowflaking
2015-10-11 15:46:50 -04:00
Fox McCloud
8134abf488 Merge pull request #2339 from tigercat2000/pullfactor
-tg- pull refactor
2015-10-11 15:46:36 -04:00
TheDZD
c2ffc31963 Merge pull request #2335 from Fox-McCloud/fix-dem-destroys
Last Few Destroy Fixes
2015-10-10 18:45:59 -04:00
Fox McCloud
13638cc6a6 Merge pull request #2330 from Robertha89/master
Science Goggle Analysers
2015-10-10 18:23:36 -04:00
Tigercat2000
ccdae149bb -tg- pull refactor
This commit does the following:
 - Overhauls how pull works. It is now based on a mob verb,
   mob/verb/pulled()
 - Makes the pull icon much more responsive. It is now updated whenever a
   mob starts or stops pulling an object, and instantly updates.
   - This required HUD changes. God help me.
2015-10-10 11:15:52 -07:00
Tigercat2000
4bc8c737b1 Turf cleanup, Shoe unsnowflaking
This commit does the following:
 - Removes unused variables from turfs
 - Removes the mining/drilling folder following the removal of it's turf
   variables
 - All mobs now generate dirt on simulated turfs, not just humans.
 - Shoe sounds are now handled by a proc on shoes, step_action()
  - This is called by human/Move().
2015-10-10 10:00:51 -07:00
Robertha89
1f2312768b Adds analyzers to drones and cyborgs, not the xeno drones. 2015-10-10 16:47:41 +02:00
Fox-McCloud
4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
TheDZD
07770fdda7 Merge pull request #2321 from Fox-McCloud/another-del-pass
Another del->qdel pass
2015-10-09 18:05:00 -04:00
TheDZD
bfb1744ca6 Merge pull request #2315 from Fox-McCloud/spess-corgi
Adds in Corgi Hardsuit
2015-10-09 18:04:52 -04:00
Crazylemon64
3c72286f2f Custom_emote now used in place of emote("me")
Also fixes some emotes which didn't actually exist for their respective
characters.
Left untouched: Jungle mobs, whatever those are supposed to be.
2015-10-09 13:00:05 -07:00
Crazylemon
525953616f Fixes pet emotes
I think I might want to move attack_animal up to mob/living, and add
special cases for the few mobs that need it. Any reason not to?

Also, DNM until I get the chance to test this.
2015-10-08 23:24:04 -07:00
Robertha89
836ddb15d4 Science analyser goggles 2015-10-09 08:22:45 +02:00
Aurorablade
769a5d3bff FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
Tigercat2000
17da3fb732 Hopefully fix character organ-gender issues 2015-10-08 15:23:20 -07:00
Tigercat2000
b40b4c70cc no stuttering for noise language 2015-10-08 14:24:58 -07:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Tigercat2000
f99152e011 Rigsuit Fixes: Fucking equipping not working 2015-10-08 12:43:30 -07:00
Tigercat2000
186667456f Rigsuit Fixes: FUCKING COMPILE YOU PIECE OF SHIT 2015-10-08 12:07:00 -07:00
Tigercat2000
545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/game/objects/items.dm
2015-10-08 11:16:30 -07:00
Mark van Alphen
09c0f235e6 Merge pull request #2318 from Fox-McCloud/no-pools-allowed
Axes Some Pooling of Specific Objects
2015-10-08 19:28:38 +02:00
Mark van Alphen
178ba25fbb Merge pull request #2310 from Fox-McCloud/more-destroying
More Destroying Tweaks
2015-10-08 19:28:23 +02:00
Fox-McCloud
69d7a7ed1d Axes Some Pooling 2015-10-08 01:26:15 -04:00
Fox-McCloud
1c142b10e1 Adds in Corgi Hardsuit 2015-10-07 17:02:00 -04:00
Markolie
f56f2f43dd Fixes 2015-10-07 19:39:38 +02:00
Fox-McCloud
b312ff41db More Destroying Tweaks 2015-10-06 23:29:51 -04:00
Fox McCloud
18a19df30f Merge pull request #2292 from tigercat2000/fancy
-tg- style inventory update, stripping update
2015-10-06 18:49:08 -04:00