Commit Graph

2167 Commits

Author SHA1 Message Date
Anewbe
c430275c31 Actually gives Event Managers ESAY 2017-11-05 23:06:11 -06:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
7963f539db Hopefully fixes ahelps 2017-10-21 23:27:24 -05:00
Anewbe
3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes
Halloween Costume Outfits
2017-10-16 19:01:25 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Anewbe
0741b45570 Adds costumes, improves admin outfit verb 2017-10-14 02:19:13 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
2017-10-04 20:08:55 -05:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe
dcf4a6bfea Adds give-modifier to the debug verb list 2017-09-27 01:16:04 -05:00
Anewbe
215c080b1e Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
Anewbe
d0a175994d Adds more channels to intercom msg 2017-09-24 02:00:58 -05:00
Neerti
23bf9a3ff4 Merge pull request #3864 from Anewbe/engine_setup
Implements the correct setup_supermatter verb
2017-09-22 19:29:53 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Spades
07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
Anewbe
d0d840082a Adds an event_manager chat channel 2017-09-17 19:48:51 -05:00
Anewbe
f7ff4669d9 Implements the correct setup_supermatter verb 2017-09-17 17:18:52 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00
Anewbe
ac06febd90 Merge pull request #3763 from Cameron653/master
Allows people with debug access to restart easier.
2017-09-07 16:00:15 -04:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Mechoid
7de08c2420 Fix them Travis errors. 2017-09-03 13:21:05 -07:00
Spades
2dd7519e1b Loadouts 2017-09-03 14:33:13 -04:00
Cameron653
9f99603011 Update admin_verbs.dm 2017-09-03 11:10:27 -04:00
Cameron653
c7266f9cd8 Allows admins w/ debug access to restart the server easily 2017-09-03 11:09:40 -04:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
killer653
b82012e55e This seems to work. 2017-08-12 18:15:49 -04:00
killer653
2e153d876a Gives admins with R_ADMIN their quicknif verb 2017-08-09 17:43:54 -04:00
killer653
0f344dad3e Does some things 2017-08-06 19:10:50 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
MagmaRam
ab51b83662 Merge pull request #3657 from Anewbe/admin_intercom
Hackfixes the admin intercomm verb
2017-07-28 15:18:12 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Anewbe
48935dcde2 Hackfixes the admin intercomm verb 2017-07-27 18:52:34 -05:00
killer653
c7931e618d Changes QUICK_NIF required perms 2017-07-26 19:00:36 -04:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00