cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 2 Branches 1 Tag
d7650f55ea65bc3b3b89b51f564749faee530e23
Commit Graph

375 Commits

Author SHA1 Message Date
JimTheCactus
646aad945e Merged getFlatIcon rendering from tgstation 
Based on tgstation #2826. This is not all of it though.
 2014-07-27 17:21:19 -06:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
Ccomp5950
2acf93215b Added . and # prefix to language keys checks (like radios) 
Fixes #5748
 2014-07-23 21:58:50 -05:00
Mloc-Argent
38c5b38017 helpers: fix move_contents_to() not moving air 
fixes #5232

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-30 23:21:29 +01:00
DJSnapshot
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 
Conflicts:
	code/setup.dm
 2014-06-23 00:25:39 -07:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Chinsky
9e3ad09b8c Shortened helper. 
Added new helper for alternative mixing.
 2014-06-18 23:44:11 +04:00
Chinsky
f79e151ba7 Shortened helper procs a little. 2014-06-18 10:55:38 +04:00
Chinsky
161b37fca0 Got vgstation13 colored lights rewrite working here. 2014-06-17 22:35:23 +04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04: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
Chinsky
238d5dfc2a Merge pull request #5211 from Ccomp5950/mentor_change 
Mentor permissions fixes and such.
 2014-06-11 13:16:18 +04: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
unknown
58700869fe Fixes #5190 2014-06-09 12:35:00 -04:00
Jeremy Liberman
2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
GinjaNinja32
42d8344f7d Change crew monitoring computer to use NanoUI 2014-06-02 09:29:34 +01:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
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
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
mwerezak
c44f11b0e5 Fixes language_keys not initialized correctly 
Also prevents speech ending verb from overriding language verb for
humans.
 2014-05-17 14:38:11 -04:00
mwerezak
c643da6198 Silicon mob types can now speak languages 2014-05-17 08:39:40 -04: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
Chinsky
91751cb56d Merge pull request #5005 from Zuhayr/mobcache 
Caching system for human icons, generalized breathing.
 2014-05-17 07:57:54 +04:00
jack-fractal
bd3eeca855 fixing the player panel to work with spirits and masks 2014-05-16 19:19:22 -04:00
Ccomp5950
cb093122d2 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-16 18:11:11 -05:00
Mike
824f9ceea8 do_after() checks both turf and loc 2014-05-16 13:13:02 -04:00
Loganbacca
78e0224649 Fixed resisting out of lockers 2014-05-15 23:03:21 +12:00
Zuhayr
081032372b Added a caching system for human icons. 2014-05-15 20:14:32 +09:30
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01: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
Ccomp5950
76f8a94974 Removes the special name coloring of those with special roles from inappropriate times. 
Basically if we don't want a privmsg link we're not going to include the font change as well.  This should fix it from displaying the coloring code in logs and other places not meant to be html (irc bot).
 2014-05-12 21:27:02 -05:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05: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
Ccomp5950
4243b1ed61 Merge pull request #4943 from Intercross21/master 
Special color for antagonists in logs and fix of alien whitelist
 2014-05-10 03:17:15 -05:00
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Intercross21
11eeecba66 Colored names in AH/PM for antagonists 2014-05-05 20:00:28 +04:00
Ccomp5950
fe4f9b0df9 Adds Mentors. 
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
 2014-05-04 23:12:06 -05:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Ccomp5950
936db263ef *NIX Log files part 2. 
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
 2014-03-26 18:51:37 -05:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems. 
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
 2014-03-23 02:26:06 -05:00