Crazylemon64
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
uraniummeltdown
53447ef17b
new runed girder icon from tg, harvesters can summon cult walls and floors and enviro smash set to 3, made cult girders a subtype of girder, fixed girder subtype names, fixed adding runed metal to runed girder not working, summoned cult walls do not drop girder or runed metal
2017-04-24 21:30:08 +04:00
Mark van Alphen
d786a78e2e
Merge branch 'master' into findnreplace
2017-04-19 20:41:05 +02:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
ZomgPonies
286a9261b6
Spacing fixes
2017-04-11 20:49:18 -04:00
ZomgPonies
d328af331f
Switched Stun to Slowed
2017-04-11 20:05:35 -04:00
ZomgPonies
06ba71d003
Superheroes update
2017-04-11 19:53:08 -04:00
Crazy Lemon
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Sam
88ec05be4e
Couple typos and a gramatically tweak
2017-04-04 14:27:22 +01:00
Fox-McCloud
183702a36e
fix up 2.0
2017-04-02 00:38:14 -04:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
Crazylemon64
36ec603a51
Rod form is now half-speed, and has a warning sound
2017-03-22 10:30:24 -07:00
Mark van Alphen
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Markolie
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01:00
uraniummeltdown
af937077cd
cooldown 25->60 upgraded 10->20
2017-02-15 16:09:51 +04:00
uraniummeltdown
60e61db55f
ports rod form wizard spell from tgstation
2017-02-14 21:05:08 +04:00
Markolie
835f68843a
Minor fixes, prevent ABSTRACT items from being summoned
2017-02-07 23:54:50 +01:00
Markolie
b55394ace3
Fix resource identifiers
2017-01-31 17:45:46 +01:00
Markolie
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Markolie
e2c60c2bdb
Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift.
2017-01-06 17:02:38 +01:00
Markolie
f4c4bfe288
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__HELPERS/unsorted.dm
# code/_globalvars/lists/objects.dm
# code/controllers/verbs.dm
# code/game/gamemodes/cult/ritual.dm
# code/game/gamemodes/cult/runes.dm
# code/game/objects/items/stacks/sheets/sheet_types.dm
# code/modules/mob/spirit/mask/mask.dm
# code/modules/mob/spirit/viewpoint.dm
# icons/effects/96x96.dmi
# icons/effects/effects.dmi
# icons/mob/actions.dmi
# icons/obj/weapons.dmi
# icons/obj/wizard.dmi
# icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Aurorablade
113f2770e3
somethingsomethingcaffine
2017-01-06 06:33:12 -05:00
Aurorablade
7fb084d690
tries to address comments...
...
and will get them wrong.
2017-01-05 22:07:21 -05:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Markolie
fec0bb3ca9
Only disable fireball if it was successfully cast
2016-11-11 21:38:45 +01:00
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Markolie
662c04a08c
Disable fireball after using it
2016-10-26 18:36:01 +02:00
Markolie
0fa43f7f41
Hopefully final magic fixes, and fixes the possessor
2016-10-25 23:32:35 +02:00
Markolie
dbc73875d7
Fix spells, shadow/Diona QoL improvements (HUD icons)
2016-10-25 18:11:09 +02:00
Markolie
e5c4b78f47
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
Markolie
5ace926e42
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Markolie
2e711d1337
Lay groundwork for megafauna, and add Ashdragon.
...
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Aurorablade
2c104adaf3
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-01 00:43:50 -04:00
TheDZD
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
Aurorablade
47dc3a3051
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-16 02:23:20 -04:00
chopchop1614
346dd3cd70
Update horsemask.dm
2016-08-06 11:32:54 +01:00
chopchop1614
5ea4d4ab2f
Update horsemask.dm
2016-08-06 11:32:26 +01:00
chopchop1614
2f5f28cc36
fixes the fix
2016-08-02 19:17:22 +01:00
chopchop1614
7f2f40d0bd
Fixes horsemask
2016-08-02 19:00:04 +01:00
Fox-McCloud
bde5755916
Implements Fire System
2016-07-29 13:24:09 -04:00
Aurorablade
bb840f4dce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-07-21 23:56:34 -04:00
Fox-McCloud
00a470fd6d
removes stupid sdisabilities
2016-07-21 02:24:54 -04:00
Fox-McCloud
1ac09a962c
Cleans up Vars
2016-07-21 01:43:16 -04:00
Fox-McCloud
a78c6cbf5d
changes
2016-07-11 22:45:44 -04:00
Fox-McCloud
943eb9b6dc
grammar
2016-07-11 02:19:24 -04:00
Fox-McCloud
762ed61881
Adds in Rathen's Secret
2016-07-10 20:04:17 -04:00
Fox McCloud
c98ba8de79
Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
...
The Honkening
2016-07-09 18:29:11 -04:00
