Crazylemon64
a8f890bad1
Updates the buildmode tool to allow for better area generator testing
2016-02-29 07:09:00 -08:00
Tigercat2000
0c9a469f2c
510: HUD, Flash Refactor, Rip out unused pain system
2016-02-28 18:09:43 -08:00
Tigercat2000
976887b2e0
Replace text2list and list2text
2016-02-28 12:07:19 -08:00
Aurorablade
5f98feb0bc
meanwhile as i driver tiger INSANE
2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-24 06:27:16 -05:00
Aurorablade
bbac4006b5
fixc all the things.
2016-02-23 02:48:13 -05:00
Crazylemon64
7f47aea249
No more superspeed simple mob attacking
2016-02-19 04:55:11 -08:00
Aurorablade
570dd619b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-18 19:01:41 -05:00
Fox McCloud
fe78b45b41
Merge pull request #3578 from Tastyfish/pda-apps
...
Complete refactor & partial redesign of the PDA
2016-02-18 13:39:37 -05:00
Fox-McCloud
7b1905477d
Tweaks Laser Eyes
2016-02-14 00:22:13 -05:00
Tastyfish
a8f9ea2086
pda refactor
2016-02-12 03:24:21 -05:00
Aurorablade
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -05:00
Crazylemon64
b3c795f8fc
Lets you follow any movable atom
2016-02-09 18:33:13 -08:00
Crazylemon64
88d90b1640
Ghosts can follow mechs
2016-02-07 13:42:42 -08:00
Aurorablade
e1899e4af9
almost
2016-02-06 18:42:26 -05:00
Aurorablade
12b3ccb2e2
why
2016-02-04 23:57:11 -05:00
Aurorablade
0fc841f0f9
can i sleep uyet
2016-02-03 00:40:10 -05:00
Aurorablade
25876fd036
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-02 15:35:54 -05:00
SakuraTheBabyfur
30833c968c
Fixes AI not being able to call the shuttle
2016-01-29 19:03:19 -05:00
Aurorablade
b2881bdc94
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-26 21:17:25 -05:00
Aurorablade
95dca71432
Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise ; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-21 21:11:26 -05:00
Fox-McCloud
c184985a3d
Merge remote-tracking branch 'upstream/master' into ling-hud
2016-01-21 18:22:52 -05:00
Fox-McCloud
fb11acbf79
Implements Ling HUD
2016-01-20 22:38:26 -05:00
Fox-McCloud
a644600ab8
Removes Vampire HUD
2016-01-20 17:45:43 -05:00
Aurorablade
678a2e9f4e
commit so i can go bugfix and do other things
...
besides code in organs...tell me what i did wrong!
2016-01-09 00:05:25 -05:00
Aurorablade
87d2023af3
so you can almost perform surgery with a claymore
...
things needed: Addeing the sharp object used as a low success allowed
tool on the fly. Handleing advanced scalpals.
2016-01-07 23:25:06 -05:00
Aurorablade
948adea83b
Added Asses as an organ
...
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Aurorablade
4b7253befc
commit so i can swap branches...
...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Aurorablade
80eb828563
this shit dosen't even compile yet...
2015-12-19 22:39:47 -05:00
Aurorablade
4947c41c8d
INDENT ERROR GRAWWRRGHHHH
2015-12-11 00:30:00 -05:00
Aurorablade
323a7e84cc
woops...
2015-12-10 22:31:50 -05:00
Fox McCloud
b8db2dd78d
Merge pull request #2682 from Aurorablade/ScreenObjs
...
Screen object cleanup
2015-12-07 01:14:39 -05:00
Aurorablade
29eba99eeb
FUCK YOU FUN CODE
2015-12-04 22:34:25 -05:00
TheDZD
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
Aurorablade
e543062396
PAWNCYPAUNCH
2015-12-02 20:57:32 -05:00
Aurorablade
42f912e238
Conflict fixes
2015-12-02 00:54:10 -05:00
Aurorablade
0e485cd893
conflicts
2015-12-02 00:21:20 -05:00
Tastyfish
280fc65938
added cancel to more powers, hand tele, cleanups to others
2015-11-30 22:30:57 -05:00
Tastyfish
1627c6b124
made AI tracking cancel-able, fixed folder labelling
2015-11-30 01:06:21 -05:00
Aurorablade
a451932e74
Fized intents, gun toggle is odd...
2015-11-30 00:17:38 -05:00
Aurorablade
58195b8e85
Screen object cleanup
2015-11-29 07:04:21 -05:00
Aurorablade
2c5a210ad8
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings
2015-11-24 21:08:43 -05:00
Tastyfish
85d651b781
refactored datum/effect/system because it was a complete mess
2015-11-22 19:43:01 -05:00
Aurorablade
5986006578
guarding yo things
2015-11-20 08:11:22 -05:00
Tigercat2000
29f42f8b61
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
TheDZD
4556e60030
Merge pull request #2473 from Fox-McCloud/blood
...
Bloody Mess Fix
2015-11-05 17:45:02 -05:00
Fox-McCloud
9e095bf360
Bloody Mess Fix
2015-11-05 08:01:26 -05:00
TheDZD
0604c8d16e
Merge pull request #2325 from Aurorablade/ForTheSwarm2
...
Fethas Carnival of Horrors part 1.5: Swarmers
2015-11-03 19:20:08 -05:00
Tigercat2000
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
Aurorablade
c520586953
changes
...
added new posible skeleton outfits
Chaplain traitor voodoo doll, Tell me if the TC cost needs adjusting.
On Click fix...
2015-10-14 20:39:29 -04:00
