Commit Graph

2167 Commits

Author SHA1 Message Date
Neerti
1cfd2f08f2 Adds AOOC functionality for antags.
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
2017-06-24 12:31:18 -04:00
Leshana
7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update
# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme
2017-06-11 15:35:42 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Leshana
82e6049821 Actually hooks up the StonedMC to run its subsystems in Polaris
* Hooks up informing Master the gameticker actually starts and stops the round subsystems will actually fire! What ho!
* We should convert the gameticker as an MC subsystem someday, and probably completely rewrite it while we are at it becuase it is crazy.  But this should bridge the gap until then.
2017-06-10 19:01:58 -04:00
Arokha Sieyes
a634b483ef Merge pull request #1674 from VOREStation/aro-qntweak
Quick NIF verb tweak
2017-06-10 15:28:58 -04:00
Arokha Sieyes
878d3597fc Quick NIF verb tweak
Use this list instead? The other one appears to contain... something else. Or be misaligned or something.
2017-06-10 03:37:01 -04:00
Leshana
69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
2017-06-09 22:54:16 -04:00
Arokha Sieyes
7441631254 Don't message on Quick NIF twice
It's annoying!
2017-06-09 15:26:22 -04:00
Arokha Sieyes
2f3b56467c Minor NIF and Soulcatcher Tweaks
- Brainmob can understand galcom so they can understand radio announcements if they're allowed to hear things.
- Adds admin verb in Fun tab for "Quick NIF" to quickly implant someone with a NIF, if for example they lost theirs via bug, or for antags in events.
- Some tweaks in Persist VR to not 'hard crash' just in case runtiming prevents other things.
- Added titles to top of *nsay and *nme boxes so you can remember what you're doing.
2017-06-09 10:16:45 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Anewbe
b9007d11a8 Merge pull request #3493 from VOREStation/just-stonedmc
Port of StonedMC master controller framework
2017-06-04 16:15:13 -05:00
Leshana
b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana
ecd19ee1af Adds an admin verb to debug the current map datum.
Useful for making sure it loaded right.
2017-05-21 14:16:39 -04:00
Neerti
6c25f5e0fd Adds Recently Cloned Modifier to Cloners
Makes new clones receive a substantial malus on combat ability, which will last between 25 to 40 minutes.
This time can be reduced by upgrading the cloner.  A fully upgraded cloner can reduce the time to 5 to 8 minutes.
Also makes new clones receive a 'cloned' modifier, which doesn't actually do anything besides act as a sort of counter for how many times they've been cloned that only admins can see at the moment.
Makes modifiers with the 'genetic' flag get copied to cloned mobs.
Adds admin utility/testing/badmin verb to give any modifier to any living mob.
2017-05-09 23:16:50 -04:00
Arokha Sieyes
80670b420c Merge current master in 2017-04-25 20:14:38 -04:00
Arokha Sieyes
4c2caf11b7 Replace 'magic' messages with Facility PA
This replaces the mystical messages of things like Command Reports, the 'All hands' message when a CD joins, and head announcements with a PA system that behaves more reasonably than pushing all the messages out of the chat box. Nothing about the systems changed, just the way they show up. They still make the sound, too.
2017-04-25 15:15:45 -04:00
Arokha Sieyes
4ae0352474 Fix debug verb for "Check Areas" 2017-04-24 14:26:05 -04:00
Leshana
70a32fcfc6 Adds admin verbs for debugging process controllers
* Adds a verb for debugging any of the running process controllers.  Unlike the old debug controller verb, this one is not hard coded, so any present and future processes will be included.  Requires R_DEBUG (and R_ADMIN if in paranoid mode)
* Adds a verb for debugging the process scheduler itself.  This is hidden by default until debug verbs are shown.   Requires R_DEBUG (and R_ADMIN if in paranoid mode)
2017-04-18 19:04:38 -04:00
Leshana
2e59e24dca Merge branch 'master' of ../Polaris into polaris-sync 2017-04-16 20:58:40 -04:00
Arokha Sieyes
aaeae6695a Make planets more generic
So that Sif doesn't have to be the only one!
2017-04-14 21:36:48 -04:00
Neerti
75cc189723 Merge pull request #3271 from VOREStation/aro-pol-panic
Quick & Dirty Panic Bunker Port
2017-04-11 21:55:59 -04:00
Arokha Sieyes
66327aecc7 Quick & Dirty Panic Bunker Port
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
Arokha Sieyes
ba1221889c Fix 'if' statement on Panic Bunker
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:12:32 -04:00
Arokha Sieyes
b3d652fa50 Quick & Dirty Panic Bunker Port
Should work! Should.
2017-04-10 22:38:58 -04:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Arokha Sieyes
a2ec0d43f1 Fix 'Spawn Character' DNA
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
2017-04-10 14:40:43 -04:00
Arokha Sieyes
2d1e2d091e Fix 'Spawn Character' DNA
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
2017-04-10 14:39:09 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Anewbe
1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
JoanRisu
bd9d9c5078 Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu. 2017-03-27 01:58:49 -07:00
Anewbe
560af2d61d Merge pull request #3116 from VOREStation/spawn
Makes the 'Spawn Character' verb include custom items
2017-03-21 18:38:23 -05:00
Arokha Sieyes
17bd2d341a Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:48:55 -04:00
Arokha Sieyes
25a84af366 Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:44:02 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe
5481e90cbe Merge pull request #3074 from VOREStation/recipes
"Recipe Dump" admin verb
2017-03-13 17:17:54 -05:00
Arokha Sieyes
9bdd3495af "Recipe Dump" admin verb
The idea of updating the wiki list of recipes is daunting, especially getting all the icons and resizing them to look nice on a webpage, so fuuuuuuuuck that.

I made a verb that does it. It dumps upsized (64x64) images of every food icon and a recipes.html file into your cache with a table that contains all the recipes, nicely formatted, in alphabetical order (the -burger and -kebab at the top are because those are [whatever-meat]-burger and [whatever-meat]-kebab).

Then you can just throw them on a website. It will include a recipes.css file if it's in the same dir.
Here's the result on our server:
https://vore-station.net/infodump/recipes.html
2017-03-13 18:01:03 -04:00
Arokha Sieyes
4f47ce2d77 "Recipe Dump" admin verb
The idea of updating the wiki list of recipes is daunting, especially getting all the icons and resizing them to look nice on a webpage, so fuuuuuuuuck that.

I made a verb that does it. It dumps upsized (64x64) images of every food icon and a recipes.html file into your cache with a table that contains all the recipes, nicely formatted, in alphabetical order (the -burger and -kebab at the top are because those are [whatever-meat]-burger and [whatever-meat]-kebab).

Then you can just throw them on a website. It will include a recipes.css file if it's in the same dir.
Here's the result on our server:
https://vore-station.net/infodump/recipes.html
2017-03-10 18:25:48 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00