d665bb0729
Fixes mistakes with using /improper instead of \improper
2015-12-08 10:37:42 +01:00
4afec741fd
Claw Game progress 2
...
Claw game is now playable from within SS13
- still need to code and test win-functionality
- still need to code prize ball and circuit board
2015-12-07 23:28:02 -05:00
2c4549d7ac
Revert "Make color dialogs appear with current color."
...
This reverts commit af94d1bf6f
2015-12-07 21:25:42 -05:00
45575ad3e9
Merge pull request #2762 from RudiPardieck/blood
...
Blood examine fixes
2015-12-07 19:27:33 -05:00
ebcc4edcef
Shuttles: P2, Escape Pods n' Fixes
2015-12-07 14:27:37 -08:00
438f6d9a8c
Corgis and mice will now heal when eating
...
As things stood, they just modified the current registered value of
health, which would immediately be recalculate. This makes this less
stupid.
2015-12-07 09:42:12 -08:00
591daf04d2
Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
...
Also corrected some periods, spelling errors etc. along the way.
If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
1c3012edd7
- Oil-covered clothing no longer shows as blood when examining a player
...
- Examining now also shows any bloody/oily feet when not wearing shoes
2015-12-07 14:31:07 +01:00
6e2288fbb8
bugfixed writing in blood
2015-12-07 14:11:58 +01:00
61c0cd1373
Merge pull request #2733 from Aurorablade/PEwPewPEw
...
More Guardian Tweaks and FUN removal
2015-12-07 01:03:22 -05:00
3fad5ca991
Merge pull request #2742 from ZomgPonies/blood
...
exotic blood changes
2015-12-07 01:03:06 -05:00
39cc526e46
SSHOVE THIS IN YOUR FACE TRAVIS
2015-12-07 00:01:34 -05:00
0f7bf4a4b4
Merge pull request #2749 from Crazylemon64/cyborg_debugging
...
Cyborgs only die once when dead, and don't break binary talk
2015-12-06 16:01:00 -05:00
c3b52b2506
Merge pull request #2736 from Crazylemon64/odysseus_resistance
...
Resist to escape an odysseus' sleeper
2015-12-06 15:59:08 -05:00
5ae02c68bf
Merge pull request #2735 from Crazylemon64/robo_surgery_fix
...
Some fixes to robotics surgery
2015-12-06 15:58:41 -05:00
6265c8e6c1
DEATH TO THE RELATIVE PATHING SCUM
2015-12-06 10:25:48 -08:00
8f52b540c7
robot/updatehealth now factors in oxyloss
2015-12-06 09:58:43 -08:00
c931c9f6be
Changes Laser gun energy consumption
2015-12-06 12:51:34 -05:00
38862b1437
Cyborgs only die once when dead, and don't break binary talk
2015-12-06 00:39:40 -08:00
bdb1c34a8e
Intensive care can now rescue dethrall malpractice
2015-12-06 00:21:33 -08:00
6fed7d7648
Somewhat desnowflaked resistance
2015-12-06 00:17:25 -08:00
5698509581
Heal Delay
2015-12-06 02:38:31 -05:00
ee607af47e
Adds small delay to healer heal clicking.
2015-12-06 02:33:30 -05:00
bc5faea093
Claw Game progress
...
Errors resulting from Prize.js currently.
- still using the original images, need to switch those out
- need to remove unneeded code/commented attempts
- need to code win-functionality (close game, give prize)
- need to code in prize orbs, arcade circuit items
2015-12-06 02:26:12 -05:00
fab7f1f6b0
exotic blood changes
2015-12-05 16:46:07 -05:00
16cdea3a2b
Changes
...
underpred projectile cap
Adds communication changes based on Ponies feedback
2015-12-05 08:14:28 -05:00
897d4fa7ee
You can now resist to escape an odysseus' sleeper
...
There's a bit of snowflaking; though I hope the method can be extended
to something more than just that single thing in the future
2015-12-05 01:48:02 -08:00
9241442cc6
Some fixes to robotics surgery
...
Internal organ fixing surgery will now work correctly on robotic organs,
using nanopaste in place of trauma kits
Defibs also don't need the body to be past the point of deadness to work
Kitchen utensils should now properly work as surgery tools where given in
code
IPC thralls can now be dethralled by performing the surgery on where their
brain is, in this case their chest. This will also work for any species
that has a brain anywhere else in their body.
2015-12-05 01:35:59 -08:00
85d4f59caf
Wow. Soft merge conflicts, in a way. Merging not causing a git error, but
...
instead, a compile error. Congrats TRAVIS, you are smarter than your
average CI.
2015-12-04 22:32:38 -08:00
79ce26684d
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
2015-12-04 22:29:29 -08:00
c3f476f62c
Supply shuttle, initial_move() fixes, dock fixes
...
Supply has been almost completely replaced by -tg-'s system.
No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08:00
22d8c8bd93
Raanged guardian click delay
2015-12-05 00:27:26 -05:00
039f0b5442
Posibrains have their mind cleared, so that no badness happens
...
No more cultist ghosts yelling about deconverting when borged
2015-12-04 17:29:28 -08:00
dc089e3146
Merge pull request #2712 from Crazylemon64/mecha_mmi_fix
...
Mecha mmi Tweaks and Fix
2015-12-04 19:23:53 -05:00
b0fd240083
Merge pull request #2721 from ZomgPonies/222
...
Nations 2.2.2
2015-12-04 16:05:18 -05:00
9809a5fc1b
Lots of cool fixes! Read below!
...
- Radio MMIs can now talk on the radio like a regular person does
- Same for MMIs in mechs
- A posibrain in a mecha doesn't lose its ability to hear binary chat
- Mechs now consume power when moving again
- Disassembling mecha wreckage now doesn't have a bunch of annoying "hit
by" messages
- MMIs in someone's grasp no longer cause a rigsuit-related runtime
2015-12-03 23:46:10 -08:00
4a328a2d76
Merge pull request #2715 from Aurorablade/GuardianStuff
...
Guardian Fixes/tweaks
2015-12-04 00:14:39 -05:00
96e3f1a1b9
URK
2015-12-03 23:57:29 -05:00
62f4f5cf66
Revolver stuff
2015-12-03 23:18:03 -05:00
6e67dfd33a
Fixes borg issues
2015-12-03 18:06:49 -05:00
a4b36540d8
Merge pull request #2706 from Crazylemon64/reclaimer_plasglass
...
Lets the ore reclaimer make plasma glass from plasma and glass
2015-12-03 17:43:11 -05:00
ec61de0a20
Star Fox told me some things i couldn't do..i fixeded them.
2015-12-03 15:11:42 -05:00
356835aa99
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
Conflicts:
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/malfunction/malfunction.dm
code/game/gamemodes/revolution/revolution.dm
code/modules/admin/verbs/randomverbs.dm
2015-12-03 11:03:01 -08:00
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
69e2567e74
Trying to figure outwhy admin version is not working
2015-12-03 02:00:55 -05:00
3f72596e62
Merge pull request #2612 from Aurorablade/Guardingthings
...
Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
2015-12-02 21:21:22 -05:00
7d6b6f9436
RAWRRGHHHH
...
FUCKING DEBUG PRINT
RAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHH
2015-12-02 21:06:13 -05:00
e543062396
PAWNCYPAUNCH
2015-12-02 20:57:32 -05:00
2274c1806d
Merge pull request #2696 from ZomgPonies/mecha
...
Speech Bubble fixes
2015-12-02 19:43:47 -05:00
07021e506b
Merge pull request #2699 from Fox-McCloud/botany-qol
...
Botany QoL Changes
2015-12-02 19:15:17 -05:00
Certh