Commit Graph

723 Commits

Author SHA1 Message Date
Leo 6d08ebac83 Merge pull request #31287 from ShizCalev/wizard-name
Correctly applies wizard names
2017-10-04 21:26:19 -03:00
ShizCalev e4a9de46dd Correctly applies wizard names 2017-10-03 19:25:53 -04:00
Robustin 9772ac1817 Bastard Sword Soul Fix 2017-10-02 14:58:37 -04:00
Robustin ec3f7623df 2H Sword to the Cult Forge - Robustin's Github Adventure (#30887)
* Automatic changelog generation for PR #30056 [ci skip]

* Updated old code

* Slowdown does nothing, removed

* Updated Sprites and Fixes

* Mysterious block issue fixed

* Update cult_items.dm

* Update buffs.dm

* Update book.dm

* Update cult_items.dm

* Delete whirlwind.ogg

* Add files via upload

* Delete items_and_weapons.dmi

* Add files via upload

* Shard list fix

* Final error fix

* Review changes, dash datum

* Why was this a diff

* Uses roundstart time for delay

* Simpler Soul Storage
2017-10-01 01:01:50 -04:00
AnturK d293ee7340 Fixes liches losing spells 2017-09-30 14:52:21 -05:00
vuonojenmustaturska 8b54685bd1 Cleanup to various loc assignments and nearby code (#31069)
* Let's hope i didn't break the game

* Requested changes

* missing one

* movetonullspace thing
2017-09-30 09:09:15 -04:00
Jordan Brown 4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
AnturK d226eda9f5 Here it is. 2017-09-27 13:21:51 -05:00
MoreRobustThanYou 747c8e11dc Using a soulstone on somebody now transfers your languages to the shade 2017-09-21 15:29:49 -04:00
Mike Long 0eef60e841 Refactors roundstart centcom threat report. (#30241)
* Refactors rounstart centcom threat report.

* Changes a .Add() to a +=

* Fixes merge.

* Another fix from the merge.  Whoops.

* Removes slashes from sandbox report.
2017-09-13 11:45:57 -04:00
vuonojenmustaturska 6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04:00
pubby 8c76d02224 Removes the multiverse 2017-08-29 19:27:42 -05:00
kevinz000 169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYou 0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
shizcalev ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk 1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk 371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
ShizCalev d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
shizcalev 8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
Jordan Brown f888a88f4c Merge pull request #29349 from lzimann/scopres
Adds proper containers for some locates
2017-07-19 16:18:03 -04:00
Lzimann c92ec9c5e4 Adds proper containers for some locates 2017-07-18 16:23:10 -03:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Leo ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Jordan Brown d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Joan Lung 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Joan Lung deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
Joan Lung 2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Lzimann 3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
kevinz000 703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
bawhoppen 0c491a9111 Removes ragin mages (#27872)
* good riddance

* tgstation.dme

* updates configs I guess

* removes other traces of ragin mages
2017-06-04 21:30:59 +02:00
Leo b642c88464 Merge pull request #27951 from ChangelingRain/wizardrods
Rod Form's damage now scales with how much it's upgraded
2017-06-03 23:41:03 -03:00
kevinz000 7bde181832 gangboss 2017-06-02 02:28:31 -07:00
Jordie f042d97448 Adds round table to replace tacking some data in feedback table (#27454)
* adds round table to replace tacking some data in feedback table

* removes obsolete code for acolytes_survived

* uses a better query

* corrects var name

* uses actual sql queries

* adds commit column and connected checks before queries
2017-05-26 22:17:44 +02:00
Robustin 5569c259ab Merge branch 'master' into culttweaks2 2017-05-22 10:36:57 -04:00
Robustin 7f2b19ebce Prevents wizard from gaining infinite skeletons with a 3-use Necrostone (#27485) 2017-05-22 09:27:40 -03:00
Robustin fd045be747 Update soulstone.dm 2017-05-21 00:14:05 -04:00
Robustin 23e9387a97 Soulstone layer 2017-05-20 07:20:19 -04:00
Robustin 425e8fca71 Fixes galore 2017-05-19 18:20:48 -04:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Robustin 3f47e55fe1 Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#27085)
* Chosen Harvesters

* Update runes.dm

* New Cult Ending

* New Cult Ending

* Cinematics added

* A couple fixes

* Update ticker.dm

* Final Touches

* Done

* Desc fix

* Update alert.dm

* Update cult_comms.dm

* requested changes

* Update uplink_item.dm

* Update alert.dm

* Update runes.dm

* Update runes.dm

* fuckinglaunchpad

* Update machine_designs.dm

* Fucking launchpad errors

* Update narsie.dm

* Update mode.txt

* moves a few pixels on the sprite for Joan

* whatever just merge it

* You know whats BS?

* While you're at it... merge this shit

* Update living_defense.dm

* Update constructs.dm

* Update living_defense.dm
2017-05-16 08:50:46 +02:00
McBawbaggings 334f886d36 Wizards are now at least 30 years old. Apprentices are 17 to 29. (#27245) 2017-05-15 09:01:38 -03:00
Cuboos 827967c965 Adds some antag alerts (#26931) 2017-05-12 17:16:57 -03:00
Joan Lung 3711b58f36 Harvesters are more fun to play (#27086) 2017-05-10 12:18:15 -03:00
Joan Lung 8b912f84aa Fixes a bunch more cult bugs (#27034) 2017-05-08 13:17:40 -03:00