Commit Graph

288 Commits

Author SHA1 Message Date
Jack Edge
78384666b1 Removes SHUTTLE_* defines being numeric
Wew, there was a lot to change. Fixes #17950. There is a lot of gamemode
code here, so I'm not entirely sure if this is ultimately worth it.
2016-05-26 18:16:45 +01:00
lordpidey
24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
tkdrg
11df2fa97a Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding
Fixes jobban cache not updating on jobbans and unbans
2016-02-18 14:03:58 -03:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Shadowlight213
11ea6993e9 Fixes jobban cache not updating on jobbans and unbans 2016-02-14 21:44:29 -08:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Lzimann
4ab36b7c29 Fix Check Antagonist button not logging when accessed by player panel 2016-01-10 04:05:24 -02:00
Tkdrg
3b1553cb8c Fixes create revolutionares bugs
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1

Fixes #14189
Fixes #14161
2015-12-31 04:19:32 -03:00
Remie Richards
dcea576585 Merge pull request #14063 from tkdrg/you_are_now_breathing_manually
Manual bans will now add notes automatically
2015-12-29 07:05:53 +00:00
Tkdrg
a87ea29c84 Adds a "dupe marked datum" option to Game Panel
Useful when something bugs out in-game and you want to test it without
fucking the original up, or maybe if you want to spam some varedited
item quickly.
2015-12-28 01:45:33 -03:00
Tkdrg
dbc6dc5957 Manual bans will now add notes automatically
Just some QoL. You should still avoid those if you can help it, though.
2015-12-26 10:59:06 -03:00
KorPhaeron
57d29d11d4 Replaces malf with traitor AI 2015-12-18 00:05:30 -06:00
Tkdrg
abb0cd663c Adds a Follow/Jump to link to the VV dropdown
Some good QoL for debugging stuff.
2015-12-17 00:45:16 -03:00
Shadowlight213
71e76f6eec Merge branch 'master' of https://github.com/tgstation/-tg-station into Aghost_control 2015-12-07 13:10:53 -08:00
Shadowlight213
0cc98d3d09 WIP 2
Most content is done. Just need Comms console and Fixing the Nanoui error.
2015-12-06 00:24:09 -08:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
Tkdrg
598fea785e Jobban cleanup & performance improvements
Clients now cache their jobbans to save on DB queries.
Legacy jobbans and "new" (savefile) jobbans have been removed.
These are old cruft that has been unused for years, and since we require
a DB for notes anyway we might as well just get rid of the legacy stuff.

I considered removing legacy bans as well, but I was unsure if that
would go way beyond the scope of this PR (my main goal here is making
jobban_isbanned not awful).

Also note that this was basically untested, as I do not have a test
database. Any help testing this would be much appreciated.
2015-11-28 12:35:54 -03:00
Shadowlight213
6a2f02fa47 Allows Database based jobbans to be lifted via the jobban panel.
Jobbans lifted this way take into effect the same round.
2015-11-07 14:57:08 -08:00
Shadowlight213
3303a926fa Removes commented out code 2015-10-19 21:15:35 -07:00
Shadowlight213
9884a6624a Adds Shadowling bans 2015-10-18 16:20:58 -07:00
Shadowlight213
35ca96331e Adds jobban support to syndicate borg
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
2015-10-18 15:25:14 -07:00
phil235
8daa8d9075 Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).
Fixes Blue space artillery button in Centcom message, nuke code request message and syndicate message.
2015-10-12 02:03:31 +02:00
Jordie0608
d19954dd6f stealthmin check for kick notification 2015-10-11 23:16:24 +11:00
Remie Richards
89b12e561f Merge pull request #12171 from Iamgoofball/patch-130
Kicks now inform you who kicked you.
2015-10-11 01:24:41 +01:00
Kyle Spier-Swenson
c1031a5a66 removes admin announce from follow.
This was only kept because it was the only easy way to claim an admin help.

Because starting to type a response to an admin help announces, this is no longer necessary
2015-10-05 20:48:07 -07:00
Razharas
070eb882db Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
Iamgoofball
77441b42c7 Kicks now inform you who kicked you. 2015-10-04 19:39:45 -07:00
Razharas
1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
GunHog
0a2be62d55 Royal Xeno Expansion
- Queens are now GIANT.
- Queens are now under the /royal type
- Added Praetorian caste.
- Buffed queen health to 400
- Royals now resist all but the strongest space winds
- Drones now must evolve into Praetorian before becoming queen.
- Queens without a Praetorian may now promote one.
- Royal Xenos now are not stunned by hulks or mechs.
- Hulks no longer push back royals, but still deal more damage.
2015-09-29 18:58:40 -05:00
MrStonedOne
c45a7c7173 MERGE CONFLICTS, MY ONLY WEAKNESS
How did you know?
2015-09-26 23:42:14 -07:00
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
Aranclanos
25f998393a Removes a sleep in the admin follow command. 2015-09-19 10:41:59 -03:00
AnturK
c2a26c81e7 Adds Create Custom Outfit admin verb
Sechud fix
2015-09-08 14:41:15 +02:00
Jordie0608
4c1730a008 Merge branch 'master' of https://github.com/tgstation/-tg-station into fromanicperspectivethesqldbislikeadivinespacecensus
Conflicts:
	code/modules/admin/topic.dm
2015-08-30 22:55:53 +10:00
Razharas
244408b575 Merge pull request #11377 from Jordie0608/ithoughtifixedthisbutapparentlynot
Fixes #11375, note ckey fix
2015-08-30 15:44:14 +03:00
Razharas
b9009c43b0 Merge pull request #11319 from Jordie0608/wouldabanforinfinityminutesstillbeatempban
Fixes #11312, Removes time limit on tempbans
2015-08-30 15:41:58 +03:00
Jordie0608
62fa9a163c interface for watchlist, improvements to memo, varedit, ban interfaces 2015-08-27 20:57:01 +10:00
Jordie0608
e65ddd0827 note ckey fix 2015-08-25 05:11:55 +10:00
Jordie0608
d8be2d5ded removes time limit on tempbans 2015-08-22 17:42:37 +10:00
Aranclanos
5655379866 Fixes the watchlist edit option not working at all 2015-08-20 08:11:48 -03:00
Jordie
4463c59849 Merge pull request #11221 from Core0verload/spawnpanel
Spawn panel improvements
2015-08-19 19:01:15 +10:00
Jordie0608
9e2c59ca24 debug fix 2015-08-15 22:34:18 +10:00
Jordie0608
e2d3488f7f database notes 2015-08-15 22:24:24 +10:00
c0
7e1bd34583 Spawn panel improvements 2015-08-15 13:34:15 +03:00