Commit Graph

1593 Commits

Author SHA1 Message Date
Razharas
7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Remie Richards
0ae0f84325 Revert "[s]Fixes the logic of IsBanned and bad CIDs" 2015-12-11 17:49:30 +00:00
Remie Richards
1efcc64990 Fixes the logic of IsBanned and bad CIDs
the bad CIDs aren't perfectly the Integer max, they're above it.
2015-12-11 17:27:42 +00:00
Incoming
6a64864805 formally defines apprentices as a kind of antag instead of as "traitors".
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
duncathan salt
160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control
Allows admins to interact with most machines like an AI [Review Ready]
2015-12-08 11:51:27 -06:00
duncathan salt
15ae23b74f Merge pull request #13257 from Jordie0608/allthevarsthatdontgeteditedbecomeverylonely
Adds on_varedit proc
2015-12-08 11:43:14 -06:00
duncathan salt
bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
Shadowlight213
71e76f6eec Merge branch 'master' of https://github.com/tgstation/-tg-station into Aghost_control 2015-12-07 13:10:53 -08:00
duncathan salt
9ec6e187a4 Merge pull request #13464 from Anonus/hostileconstructs
Spawnable hostile constructs, for away missions and adminfuckery
2015-12-06 17:25:53 -06:00
Kyle Spier-Swenson
88a795a0c6 fixes typo in is banned() 2015-12-06 12:54:36 -08:00
Kyle Spier-Swenson
0d55edc2b0 Hot fix for stickybans going hey wire 2015-12-06 12:20:12 -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
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
Bjorn Neergaard
97ca70cd34 Rework Master Controller, Failsafe, and Subsystem code 2015-12-04 15:40:58 -06:00
Jordie0608
8f7fb2c812 optimization 2015-12-04 15:54:29 +11:00
Aranclanos
d1071aa5b7 Merge pull request #13365 from tkdrg/badminthings
Admin HUD improvements
2015-12-03 01:39:51 -03:00
Bjorn Neergaard
6ec257c360 Hotfix for SStimer lag
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
2015-12-02 21:23:45 -05:00
Tkdrg
2b0ee4f591 Admin HUD improvements
Adds the sec hud for implants and stuff.
2015-12-01 19:15:06 -03:00
Tkdrg
4da263dead Fixes jobban_isbanned() runtime
Fixes runtime with ckey-less mobs.
2015-11-29 17:31:19 -03:00
Jordie
56c2659736 Merge pull request #13187 from ktccd/master
Fixes areas blobs shouldn't win from spreading to.
2015-11-29 21:06:46 +11: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
Bjorn Neergaard
6005d54d40 Update NanoUI to use the asset_cache system
Also move a bunch of folders around.
2015-11-28 00:56:30 -05:00
ktccd
395cd5a68c Rewrote a bit of blob code to fix... a lot
Stuff fixed: My sad attempt at fixing #13126.
The expand() proc for blobs is hopefully less intensive now (WHY did it
used to spawn a blob only to destroy it? That must've been such a
waste...).
Destroy code no longer needs to adjust for the expand() proc doing weird
things.
The antag panel will now show the correct variable used to determine
blob progress.
Renamed the variables I used so they're not so similar to each other.
blob_legit and blobs_legit was WAY to easy to mix up.
2015-11-28 01:06:27 +01:00
Jordie0608
18a2e58fbc adds on_varedit proc 2015-11-27 17:43:43 +11:00
Bjorn Neergaard
94e114fee7 Correct several oversights 2015-11-26 07:11:32 -05:00
Bjorn Neergaard
588a170c8d Fix NanoUI debug verb 2015-11-26 07:11:32 -05:00
Bjorn Neergaard
1a44e3d851 Refactor NanoUI API
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Bjorn Neergaard
5e9c0adc3b Add NanoUI debug verb
A quick tool that helps me reload templates.
Also refactor NanoUI resource code a bit.
2015-11-26 07:11:29 -05:00
Kyle Spier-Swenson
226c92bbca Fixes readmin not working with keys 2015-11-20 21:11:26 -08:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Cheridan
caa7adeeba Merge pull request #13022 from tkdrg/morefix
R&D and Misc Fixes/Tweaks
2015-11-15 14:19:44 -06:00
Razharas
62cd83fa30 Merge pull request #12778 from AnturK/minor_upgrades
Mech Speech Bubbles, POI list for Observe
2015-11-15 09:07:21 +03:00
Tkdrg
8c694d9fc0 R&D and Misc Fixes/Tweaks
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.

Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
2015-11-14 13:35:05 -03:00
Cheridan
3a62235415 Merge pull request #12791 from KorPhaeron/removelizardremovelizard
Human only ERT and Deathsquad
2015-11-11 13:20:49 -06:00
duncathan salt
8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas
Adds a series of ridiculous weapons to the wizard spellbook
2015-11-11 10:47:04 -06:00
Tkdrg
a63a1f1dea Red deity fix
No longer shows red deity on check antags even when not HoG.
2015-11-10 00:00:24 -03:00
Cheridan
948ab822d2 Merge pull request #12930 from tkdrg/hoog
HoG fixes
2015-11-09 18:25:57 -06:00
Tkdrg
c4fc8defec HoG fixes
Fixes check antag when gods are dead.
Borging antags no longer announces removal of antag status.
Removes stun from Smite.
Fixes #12929
Fixes #12927
Fixes #12936
2015-11-09 19:54:07 -03:00
KorPhaeron
780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06:00
Jordie
eadbfc9b1c Merge pull request #12915 from Shadowlight213/emoteban
Adds emote bans
2015-11-09 15:47:35 +11:00
Jordie
07464d1f10 Merge pull request #12911 from Shadowlight213/DbJobunban
Allows database based jobban lifting via the jobban panel
2015-11-09 15:47:10 +11:00
Shadowlight213
9fe0bdf583 Adds emote bans. 2015-11-07 18:32:35 -08:00
Shadowlight213
981dd378f4 Removes extra line 2015-11-07 14:59:18 -08: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
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00
Shadowlight213
ef8598e7d1 Changes asay and dsay logging so they are seperate logging types. 2015-11-03 20:07:55 -08:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
Razharas
3951ccc3c3 Merge pull request #12771 from Jordie0608/totallyaspookyhalloweenchange
Removes ntsl investigate
2015-11-01 19:29:56 +03:00