633a9e68b4
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
^ This shit is haunted. It's conflicted on two branches for 0
reason, the automatic merge wouldn't work on the fucking end of
file.
2015-10-19 16:13:51 -07:00
7908591af3
Merge pull request #2386 from Fox-McCloud/reagents-seeing
...
Reagent Scanner/Seeing
2015-10-19 18:53:45 -04:00
a19c391beb
Merge pull request #2391 from Fox-McCloud/say-bubble-fix
...
Say Bubble Refactor+Fix
2015-10-19 18:52:07 -04:00
6d2a2f3eba
tweaks
2015-10-19 17:20:35 -04:00
1404c88229
fixes
...
will still need to look at using transfer_to and the language key
2015-10-19 08:27:06 -04:00
3a2590261b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-18 21:37:28 -04:00
8774ec1f66
Lights and Static Power: Machine Processing Optimization
2015-10-18 21:06:25 -04:00
597108dc40
Say Bubble Refactor+Fix
2015-10-18 18:58:21 -04:00
dfd070fe44
Merge pull request #2378 from Fox-McCloud/clean-up
...
Code Cleanup
2015-10-18 16:44:53 -04:00
d681cefa03
Merge pull request #2362 from Fox-McCloud/gc-everything
...
Garbage Collect Everything
2015-10-18 16:44:35 -04:00
f8af90b9f8
Merge pull request #2385 from Fox-McCloud/egg-runtime
...
Fixes Egg Runtime
2015-10-18 16:42:50 -04:00
aabdfc3924
Reagent Scanner/Seeing
2015-10-18 00:44:15 -04:00
06975138d1
Fixes Egg Runtime
2015-10-18 00:01:11 -04:00
f08062f566
Reduces Round-start Atmos Processing: Full Charge Disposals
2015-10-17 19:53:21 -04:00
8c67b24506
Code Cleanup
2015-10-17 05:58:37 -04:00
688d148105
Merge pull request #2373 from tigercat2000/disposalpipesstopit
...
Fix disposal pipe icon issues, unify slightly, little bit of unpathing
2015-10-16 17:05:22 -04:00
d6cb0f9075
Merge pull request #2365 from Crazylemon64/apc_autolathe
...
APC electronics refactor
2015-10-15 16:03:08 -04:00
b0ef041bd9
Fix disposal pipe icon issues, unify slightly, little bit of unrelativing
2015-10-15 10:13:43 -07:00
9d45ee8b81
Merge pull request #2355 from Fox-McCloud/eye-fixes
...
Eyes Fixes and Chem Tweaks
2015-10-14 18:29:57 -04:00
cd502b6a16
surgeryize me cap'n
2015-10-14 07:05:49 -04:00
76c648e028
Actually adds the fix I made after the failed compile on my own end
2015-10-13 21:23:22 -07:00
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
d141945b10
Changed based on feedback
2015-10-13 23:01:28 -04:00
8d69ff7d9c
>FUCKING BAYCODE
2015-10-13 19:58:17 -07:00
dd97cc261d
Merge pull request #2343 from Fox-McCloud/game-mode-cleanup
...
Removes Nations and Unused Gamemodes
2015-10-13 21:34:49 -04:00
e60edf9345
Garbage Collect Everything
2015-10-13 20:23:26 -04:00
f2c868da2f
Makes Monkey Cubes GC
2015-10-13 16:10:01 -04:00
e19a8a405b
mitocholide buff
2015-10-12 23:17:13 -04:00
34eadf298e
more 3 fixes
2015-10-12 22:28:25 -04:00
e83ebc3d52
Eyes Fixes and Chem Tweaks
2015-10-12 19:39:12 -04:00
cbe21922ef
Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing
...
More Dereferencing
2015-10-12 16:36:14 -04:00
46f9f68f31
more de-referencing
2015-10-12 04:18:49 -04:00
81cfcd7af3
More Dereferencing
2015-10-12 02:37:52 -04:00
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
2b54e5cf63
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-11 22:50:27 -04:00
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
a3af2f124e
Rigsuit Fixes: ONE LESS SNOWFLAKE
2015-10-11 16:22:07 -07:00
8fff9a327a
Rigsuit Fixes: WHO DOESN'T LOVE SOME REDUNDANCY UP IN HERE
2015-10-11 15:58:41 -07:00
ab1198f7f0
Rigsuit Tweaks: Hydrocodone is close enough to oxycodone, right?
2015-10-11 15:56:29 -07:00
f51dd440e8
Nuke voidsuits, unnecessary
2015-10-11 15:35:47 -07:00
b0b79080b6
Nukes an apostrophe that doesn't play nice
2015-10-11 15:34:03 -07:00
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
61dd485323
Merge pull request #2338 from tigercat2000/MONSTER
...
Turf cleanup, Shoe unsnowflaking
2015-10-11 15:46:50 -04:00
8134abf488
Merge pull request #2339 from tigercat2000/pullfactor
...
-tg- pull refactor
2015-10-11 15:46:36 -04:00
c2ffc31963
Merge pull request #2335 from Fox-McCloud/fix-dem-destroys
...
Last Few Destroy Fixes
2015-10-10 18:45:59 -04:00
13638cc6a6
Merge pull request #2330 from Robertha89/master
...
Science Goggle Analysers
2015-10-10 18:23:36 -04:00
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
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
1f2312768b
Adds analyzers to drones and cyborgs, not the xeno drones.
2015-10-10 16:47:41 +02:00
4c5706bc3a
more...fixes
2015-10-10 08:52:35 -04:00
Tigercat2000