Commit Graph

505 Commits

Author SHA1 Message Date
Cheridan 3515e6767d Merge pull request #4940 from JJRcop/sdql2-multiquery
Adds multi-query support in SDQL2
2014-10-02 22:09:04 -05:00
JJRcop b73f1da01e Moves SDQL2 query verb into Debug tab by default, instead of being under debug-verbs 2014-09-29 22:37:55 -04:00
ikarrus b3e4bf8b7d Admin message also says what the mission is 2014-09-27 16:58:27 -06:00
ikarrus adb66f2264 Make Deathsquad button can be used more than once 2014-09-27 16:56:33 -06:00
Cheridan ff5ec967eb Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-23 09:02:43 -05:00
JJRcop e87f2fcb89 I accidentally made querys run anyway even if they had parsing errors, fixed that 2014-09-23 01:02:52 -04:00
Swag McYolosteinen 9fc6fccf17 Merge pull request #4616 from Ikarrus/revvsrev
Gang Mode for TG
2014-09-22 20:28:47 +02:00
JJRcop d88ef0b5db Editing example to fit example description 2014-09-22 02:46:50 -04:00
JJRcop 183ad9c7f3 Adds multi-query support in SDQL2 2014-09-22 02:22:03 -04:00
ikarrus eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
Jordie0608 facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Miauw e66f74439a Fixes radio MMIs turning exofabs into radios.
Also removed the obsolete GLOBAL_RADIO_TYPE variable.
2014-09-20 15:19:29 +02:00
Aranclanos fb15795f2b Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" 2014-09-19 13:38:10 -03:00
ikarrus 7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Remie Richards 49bf678e7f Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
2014-09-19 16:00:29 +01:00
Alex 6a083ecda0 Merge pull request #4835 from Aranclanos/Entered
Entered() cleanup
2014-09-16 12:12:04 +01:00
Aranclanos 53f48fa599 Cleaned up the turf Entered() procs:
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
ikarrus 9b8322c19d Shuttle Call/Recall Tracing in Announcements
- Emergency  shuttle call/recall announcements will say when a tracing attempt has been successful, as well as explicitly telling players how to view them
- Clarified language further on how emergency shuttle tracing is done
- Increased tracing success rate from 60% to 70%
- Removed a lot of duplicated code by moving all the priority_announce() calls to incall()
2014-09-13 12:50:38 -06:00
Jordie0608 272787615d Makes show attack log only ask once 2014-09-11 11:39:07 +10:00
Alex 9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup
Nuke Ops Update
2014-09-06 19:10:38 +01:00
ikarrus dbf7392649 Every time we would have pulled a random ghost into a mob, we will poll the ghosts for volunteers first. 2014-09-03 23:36:23 -06:00
Firecage 6d259e10ec Spanclass fixes 2014-09-03 20:00:35 +02:00
ikarrus 3e4378f75f - A leader will always be chosen
- Nuke ops will all stop spawning on the same spawn location (TC management console)
2014-08-31 21:27:32 -06:00
ikarrus 908cac5ac0 Quick-Create Nuke Ops Actually Working
- A nuke will actually spawn with them
- The armory closet (pinpointers, etc) will actually spawn
- Cleaned up code
2014-08-31 19:27:41 -06:00
Alex 660a76e2a8 Merge pull request #4611 from Ikarrus/reportgrammar
Minor grammar correction for Centcom report names
2014-08-31 12:36:58 +01:00
ikarrus f901a0e98a Additional Tweaks 2014-08-31 01:50:16 -06:00
Alex 679e0bda52 Merge pull request #4524 from Ikarrus/eventsprompter
Trigger Events verb will now ask if the admin wants to announce to the crew
2014-08-30 20:12:46 +01:00
ikarrus 2f65498aa7 Minor grammar correction for Centcom report names 2014-08-30 11:18:19 -06:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
ikarrus cba3fa364f Reducing dup code 2014-08-23 21:43:48 -06:00
ikarrus 5413812958 Deathsquad names will pull from the deathsquad name list
I didn't know they were a thing. But now they are, once again!
2014-08-23 21:41:49 -06:00
ikarrus 951c8bddef Resolve Conflicts:
code/modules/admin/topic.dm
2014-08-22 12:58:59 -06:00
ikarrus 9843dbc37d Trigger Events verb will now ask if the admin wants to announce to the crew
Additionally,
-Create virus re-added to secrets menu, as it had options to specify a specific virus to create
-Blob added to One-Click-Antag with the option to set the strength of the blob (1=Weak, 2= Strong, 3=Full)
2014-08-21 21:33:53 -06:00
ikarrus 0891744c8e Resolved Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-08-21 19:47:30 -06:00
Alex 01354b70f3 Merge pull request #4458 from Ikarrus/trigger_event
Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab
2014-08-21 13:28:16 +01:00
Alex 7e25fe77e8 Merge pull request #4461 from Jordie0608/tbhtheentirefeatureiskindasilly
Updates admin nicknames, moves list to txt file
2014-08-18 08:25:05 +01:00
ikarrus 0de9402a18 Made receiving and printing centcom reports a proc
Also changed a few "Cent. Com." strings to "Centcom"
2014-08-17 13:03:11 -06:00
ikarrus 9d4d755174 Made deathsquads traitors to aid in tracking, admin tools, and end-round reporting 2014-08-16 10:50:52 -06:00
Jordie0608 ac1a479da8 Updates admin nicknames, moves list to txt file 2014-08-16 19:14:17 +10:00
Ikarrus 67a18271f2 Update one_click_antag.dm 2014-08-16 00:46:24 -06:00
ikarrus d56274a4ab Adds Deathsquad to Quick-Create Antagonist Menu
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
2014-08-16 00:40:37 -06:00
ikarrus 170c0e1b6b Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab.
-No more need to maintain a list of events to trigger
-No more needing to use debug-verbs to trigger all events
2014-08-15 20:24:49 -06:00
ikarrus 51251a2449 Fixes #4220 (Select-Equipment > As Job... doesn't assign jobs to their ID and PDA)
Fixes #4220
2014-08-14 22:43:58 -06:00
Aranclanos 837428babd Merge pull request #4370 from hornygranny/badmins
admins can't edit their rank's powers
2014-08-09 17:02:28 -03:00
Hornygranny c538030790 admins can't edit their rank's powers 2014-08-07 12:00:48 -07:00
paprka d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
Conflicts:
	code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
paprka d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
KyrahAbattoir fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures.
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
paprka b35cee5334 Removes extra periods from ban reasons 2014-07-17 17:51:20 -07:00
ikarrus d3ec4dbf72 Resolving Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-27 09:30:43 -06:00