Zuhayr
2703333312
IPC tweaks.
2014-01-29 16:05:43 +10:30
Zuhayr
4a0fb22530
IPC brain surgery code.
2014-01-29 16:01:25 +10:30
Zuhayr
f3d0efea87
IPC feeding from APCs, IPC lack of reagent processing.
2014-01-29 15:37:08 +10:30
Zuhayr
66173043b1
Actually applied nymph speech and name change.
2014-01-29 04:35:44 +10:30
Zuhayr
9301c72933
Fixing case on some del() calls.
2014-01-29 04:31:38 +10:30
Furlucis
0f8b1b09ab
Small borer fix
...
Someone forgot an exclamation point and made the check for a lack of
brain check FOR a brain, making the assume direct control thing not
work.
2014-01-28 00:32:39 -05:00
Zuhayr
69d260a11d
Preliminary surgery work for IS_SYNTHETIC.
2014-01-28 16:00:36 +10:30
Zuhayr
c0b91504b4
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
2014-01-28 15:59:50 +10:30
Zuhayr
ae7ae5a837
IPC hairstyles.
2014-01-28 15:58:26 +10:30
Zuhayr
9d7b42f6b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:42 +10:30
Chinsky
ada2ba9a2f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
...
Conflicts:
code/modules/power/cable.dm
icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Zuhayr
84b3512261
Merge pull request #4345 from RKF45/misc
...
Fixes for my earliest commits
2014-01-26 09:16:07 -08:00
Ccomp5950
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08:00
Ccomp5950
a3befe9936
Private message fixes. Stealth-mode / admin != maroon
...
Stealth-Mode Admins won't have their keys show up in the title of private messages anymore (unless the person sending the message is mod+)
Admins PM's to players will show up as red again. You are welcome Virgie!
2014-01-25 22:16:58 -06:00
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
Ccomp5950
14c2e3f612
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:29 -06:00
Ccomp5950
16904ec5ec
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:09 -06:00
Zuhayr
98177f5a33
Compile fix for what I think was a botched merge with Chemistry-Machinery.dm.
2014-01-25 03:18:48 +10:30
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Loganbacca
867d0d6967
Areas added to powernets again
...
Fixes #4328
New z-level code wasn't handling d1 == 0 cables correctly.
2014-01-24 17:26:33 +13:00
Chinsky
6da9f68a7a
Merge pull request #4329 from Ccomp5950/gun_fixes
...
Sniper Rifle fixes
2014-01-23 09:07:53 -08:00
Ccomp5950
3d44e909bd
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 01:39:10 -06:00
Ccomp5950
8ae4e41aaa
Derp merge deconflict error I made when merging master into dev-freeze.
2014-01-23 01:36:32 -06:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
Ccomp5950
2d25c94900
Sniper Rifle Zoom proc documentation comments.
2014-01-22 23:46:05 -06:00
Ccomp5950
b260d511fb
Gun fixes.
...
You die, you are zoomed out
You have welding equipment on, you can't zoom in.
2014-01-22 23:40:32 -06:00
Ccomp5950
fbcf162416
Sniper Rifle fix.
...
You have no HUD when zoomed. None, I'm unable to move every HUD element while zoomed in so you lose it. Consider it part of your concentration while zoomed in.
If you move while zoomed in you automatically zoom out, you lose concentration.
If the rifle isn't in your active hand you can't zoom in.
2014-01-22 22:40:21 -06:00
Ccomp5950
84eefc3b31
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes
2014-01-22 22:39:16 -06:00
Zuhayr
dba1ad0819
Merge pull request #4316 from RKF45/robots
...
Fixes for emagging robots
2014-01-22 01:09:51 -08:00
DJSnapshot
e76838bd6e
fix for muting deadme as well.
2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9
Admin requested addition of a global dsay toggle.
2014-01-20 18:27:12 -08:00
Furlucis
005d72feb4
Typo fix
...
Fixes a reagent recipe.
2014-01-20 03:20:35 -05:00
Chinsky
3b26dab954
Merge pull request #4309 from LBraindead/dev
...
AMEN
2014-01-19 21:25:19 -08:00
Chinsky
8430e0a720
Merge pull request #4319 from RKF45/colour
...
Realistic colour mixing
2014-01-19 21:23:45 -08:00
Ccomp5950
0870844898
SMES fix, AI's can now use them.
...
Thinking this was a typo, though quite honestly I'm not sure why this test
is even here as distance checks are built into nanoUI but since feradan put it in
I'm kinda not wanting to remove it.
2014-01-19 21:26:15 -06:00
Loganbacca
7f89f602b2
Fixed rad collector toxin drain bug
...
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
2014-01-20 16:16:02 +13:00
RKF45
d35c9954b6
Rework of colour mixing
2014-01-19 21:47:42 +01:00
RKF45
5a9e8e0f30
Fixes for emagging robots
2014-01-19 12:16:10 +01:00
RKF45
ca4bb831d4
Debug
2014-01-19 12:03:32 +01:00
Chinsky
6175ef8012
Moved cable definition to cable.dm because what the fuck.
2014-01-19 03:05:48 +04:00
Chinsky
669ae9a1ae
Made cables use color var instead of separate icons for each color.
...
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
2014-01-19 03:02:58 +04:00
RKF45
75e66d546a
Rework of colour mixing
2014-01-18 21:09:02 +01:00
LBraindead
1f9716d1f2
Update disposal.dm
2014-01-18 01:10:18 +01:00
LBraindead
3879477151
Update disposal-construction.dm
...
new pipe construction
2014-01-18 00:32:06 +01:00
LBraindead
f3240073dc
Update disposal.dm
...
new disposal pipes
2014-01-18 00:31:27 +01:00
LBraindead
4bccee98ba
Update power.dm
...
powernet connection for z-levels
2014-01-18 00:20:22 +01:00
LBraindead
cfcb3e65cd
Update cable.dm
...
cable construction
2014-01-18 00:19:08 +01:00
Furlucis
7dd5968f76
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-17 03:05:04 -05:00
Furlucis
5268e4f299
Removes the second holywater
...
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.
2014-01-17 02:57:47 -05:00
