cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 5 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

1365 Commits

Author SHA1 Message Date
mwerezak
25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle 
Conflicts:
	code/setup.dm
 2014-06-24 00:09:17 -04:00
mwerezak
9e0562b16c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
 2014-06-23 22:00:57 -04:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30
mwerezak
71351bd285 Some fixes 2014-06-22 20:40:08 -04:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Boop
a903e400dd Fixes #5088 
also fixes more runtimes that mloc gave me
 2014-06-17 20:35:48 +01:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/unsorted.dm
 2014-06-12 18:56:26 +01:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Ccomp5950
0e0c692634 Removed debugverb 2014-06-11 00:51:20 -05:00
Ccomp5950
77c733b17c Mentor permissions fixes and such. 
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
 2014-06-10 19:48:41 -05:00
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
mwerezak
b4bb8ab31d Reworks shuttles to be more extensible 
Kudos to Zuhayr for laying the groundwork for this.
 2014-06-09 23:41:29 -04:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
730623e6e4 Adds support for different shuttle states 
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
 2014-06-09 23:38:53 -04:00
Ccomp5950
f0a75407b8 Rights check instead of holder check? Sure why not. 
Mentors can now see ahelps.
 2014-06-03 15:28:14 -05:00
Zuhayr
54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Zuhayr
c01b124ac7 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn. 2014-06-03 18:06:05 +09:30
Zuhayr
405055eda8 Some cleanup stuff for prior commits. 2014-06-03 15:40:40 +09:30
Zuhayr
00c81bb675 Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 2014-06-03 15:26:34 +09:30
Ccomp5950
1350115824 Mentor Unnerf. 
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel.  The idea is so they can't tell who is an antag through this.
 2014-06-02 07:09:00 -05:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Ccomp5950
b0b7953af7 Mentor changes. 
Mentors no longer see stealthmins
Mentors no longer see antagonists / have check_antagonist verbs
New debug verb:  Reload Mentors (or mods)
 2014-06-01 13:51:49 -05:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
mwerezak
d5b22e9125 Forgot to add VV menu entry for give_disease2 2014-05-24 12:14:16 -04:00
mwerezak
2c3ecc78d5 Fixes #4889 2014-05-24 11:54:55 -04:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Jeremy Liberman
5f025b630a Mutiny fixes; add sanity checks, prevent recruitment spam, fix pinpointer description, fix overlays when changing teams, and convert indents to tabs 2014-05-18 11:05:04 -05:00
Zuhayr
1679b4062f Merge pull request #4985 from jack-fractal/dev 
Masks of Nar'sie - Testing Version
 2014-05-17 14:01:00 +09:30
Zuhayr
04315c1d43 Merge pull request #5001 from Intercross21/dev 
More nice looking give spell/disease interface
 2014-05-17 10:42:31 +09:30
jack-fractal
bd3eeca855 fixing the player panel to work with spirits and masks 2014-05-16 19:19:22 -04:00
Intercross21
e6efa81c77 More nice looking give spell/disease interface 2014-05-15 22:03:16 +04:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
 2014-05-13 20:45:05 -04:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Hibernia
f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Zuhayr
85279c97c4 Added toggle verb for drones. 2014-05-11 22:00:34 +09:30
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Ccomp5950
e4089f2fd0 Re-adds Show Player Panel right click menu on players. 2014-05-09 05:41:43 -05:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Ccomp5950
37e33cba9a AdminPM fixes 
Invisimins won't show what their rank is it will simply say "Admin"

Non-staff won't get to see the adminlink (?)

People receiving adminPM's won't get the wrong version of it allowing them to only reply to themselves.

Removed the commented out stuffs.
 2014-05-07 13:56:25 -05:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
0d597fe8db Merge pull request #4912 from Ccomp5950/mentors 
Adds Mentors.
 2014-05-07 10:00:27 +09:30
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Intercross21
0e40a3f2dd And little more fixes 2014-05-05 19:38:09 +04:00
Intercross21
cef243188a AH with link 2014-05-05 19:25:50 +04:00