Tastyfish
b2abdd34c1
added input cancelling to pda msg, chemmaster ops, borg mod selection
2015-11-30 01:06:21 -05:00
Tastyfish
e562d9d0c2
added input cancelling to pda msg, chemmaster ops, borg mod selection
2015-11-30 01:00:15 -05:00
ZomgPonies
6988ea6624
Missing brackets
2015-11-29 23:25:32 -05:00
ZomgPonies
a765d4587b
Add the ability to choose a heir and for heir to takeover
2015-11-29 19:52:31 -05:00
SvartaSvansen
528ad01873
The non-Vox are taking all the Vox socks!
2015-11-29 18:58:00 -05:00
ZomgPonies
bb470d2955
Kickoff Nation leader picking
2015-11-29 16:56:11 -05:00
Fox-McCloud
36d5b7636f
Simple Animal Faction Fixes
2015-11-28 14:28:27 -05:00
Fox McCloud
dfd7b410cb
Revert "Readds the old ponytail style"
2015-11-27 23:31:09 -05:00
Aurorablade
17864ddf4e
REVIEW IT REVIEW IT NOW
2015-11-27 22:29:17 -05:00
Fox McCloud
0b429d8538
Merge pull request #2673 from TheDZD/fixes
...
Assorted Fixes
2015-11-27 19:53:35 -05:00
TheDZD
2bf228d0fd
- Fixes #2669
...
- Re-orders code in simple_animal/vox.dm death() to be the same as it was previously, so that the Vox Armalis actually display a visible_message on death.
2015-11-27 18:43:01 -05:00
TheDZD
dc94291235
- Fixes DNA injectors causing runtimes when injecting mobs with a null DNA var.
...
- Fixes statues and vox armalis simple_animal mobs causing infinite loops and crashing the mob controller on death.
- Fixes heavy lasers (and a few other unused projectiles) rotating incorrectly.
2015-11-27 18:23:39 -05:00
TheDZD
ee9a243b92
Merge pull request #2667 from Regen1/hair_fix
...
Readds the old ponytail style
2015-11-27 17:45:03 -05:00
Fox-McCloud
81d3019192
fix
2015-11-26 18:28:19 -05:00
Regen
3972b3bfa3
Readds the old ponytail style
...
A lot of people seemed to miss it, and it's not like it was hurting
anyone.
(IAMSORRYFORTHEDBPROBELSDZD)
2015-11-26 21:49:20 +01:00
Fox-McCloud
59a929cd34
Ports over TG Sentience Potion
2015-11-26 12:08:16 -05:00
Aurorablade
d42257b59e
fixes and tweaks
2015-11-26 02:35:32 -05:00
Aurorablade
a233403014
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Guardingthings
2015-11-26 01:53:53 -05:00
Fox McCloud
b1e915f266
Merge pull request #2662 from ZomgPonies/borg
...
Bunch of robutt stuff
2015-11-25 23:38:49 -05:00
Fox McCloud
4556878f96
Merge pull request #2658 from SvartaSvansen/char-setup-fix
...
Fixes a couple character setup issues
2015-11-25 23:17:21 -05:00
ZomgPonies
3cb7ec5e08
Bunch of robutt stuff
2015-11-25 22:41:09 -05:00
ZomgPonies
7b538b80a6
Fuck Race Conditions
2015-11-25 21:20:45 -05:00
TheDZD
d79c278fce
Merge pull request #2625 from Aurorablade/FixyFixy
...
[Fix] Ghost in the Swarming Shell
2015-11-25 20:06:39 -05:00
TheDZD
7048dce1a2
Merge pull request #2657 from ZomgPonies/nations6
...
Nations 2.1.3 bugfix + other bugfixes
2015-11-25 20:04:33 -05:00
TheDZD
1b5b56f1ac
Merge pull request #2656 from RudiPardieck/master
...
Fix for harm intent not working on white ui
2015-11-25 19:55:14 -05:00
ZomgPonies
8157f9e1db
To make DZD joyous
2015-11-25 19:50:55 -05:00
ZomgPonies
ca8d675a94
world.view
2015-11-25 19:41:23 -05:00
ZomgPonies
a3969051d7
Fixes HUD overlays, a runtime with borgs AND AI sec/medhuds
2015-11-25 19:30:30 -05:00
TheDZD
de1a8e4aba
Merge pull request #2650 from Regen1/more_hair
...
Adds more hair, changes one old hairstyle
2015-11-25 18:47:26 -05:00
Regen
ea79370a5c
Updates hair, adds some new hairstyles
...
Updates the old female ponytail
Old: http://puu.sh/lx6OA/690c0fc93c.png
New: http://puu.sh/lx76U/a83c6bb515.png
changes the name of the male ponytail from "Ponytail1" to Ponytail male
Changes ponytail 3 to ponytail alt
Adds the High ponytail and the Wisp
2015-11-26 00:27:24 +01:00
SvartaSvansen
3331a39cc8
Vulp tails need love.
2015-11-25 17:13:51 -05:00
SvartaSvansen
1e36372d3e
Icon names gotta match.
2015-11-25 17:08:52 -05:00
Aurorablade
128ce44ff6
Added Wizard item
2015-11-25 17:01:55 -05:00
ZomgPonies
e803647ac6
Fixes shield overlays
2015-11-25 12:56:46 -05:00
Aurorablade
08736da14c
yet more conflict fixes.
2015-11-24 21:33:23 -05:00
Aurorablade
1e83404b80
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy
2015-11-24 21:17:35 -05:00
Aurorablade
a8fa0e38df
Conflict fixing
2015-11-24 21:16:53 -05:00
Aurorablade
2c5a210ad8
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings
2015-11-24 21:08:43 -05:00
Aurorablade
41ef93a76d
UrkUrk
2015-11-24 19:52:53 -05:00
Tastyfish
317760a7de
Merge remote-tracking branch 'upstream/master' into path_cleanups
...
Conflicts:
code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
TheDZD
3d8ebd680a
Merge pull request #2633 from ZomgPonies/hulk
...
HULK fixes and balance
2015-11-24 16:47:35 -05:00
TheDZD
41765152a0
Merge pull request #2642 from ZomgPonies/nations5
...
Nations 2.1.2 bugfix
2015-11-24 16:45:25 -05:00
Aurorablade
8f3727b35d
silly ghosts, you do not step on glass...
2015-11-24 15:42:09 -05:00
ZomgPonies
fa84af4e22
Removes changes to RUN
2015-11-24 11:44:11 -05:00
Tigercat2000
b007c3cff7
Fix internals dropping exploit.
2015-11-24 07:07:52 -08:00
Certh
906d0d5a67
Tiny grammar fix
2015-11-24 14:32:48 +01:00
TheDZD
9afae90ee4
Merge pull request #2628 from Fox-McCloud/slime-extracts
...
TG Slime Extracts Port
2015-11-23 17:22:50 -05:00
TheDZD
56d2da55b8
Merge pull request #2629 from Fox-McCloud/fox-rest
...
Adds Fox Resting Sprite
2015-11-23 17:22:45 -05:00
ZomgPonies
0aa20e2eeb
Minor nations bug fixes
2015-11-23 14:32:48 -05:00
Aurorablade
677b38304d
well this escalated quickly
2015-11-22 23:16:30 -05:00
