Commit Graph

357 Commits

Author SHA1 Message Date
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
Ccomp5950
ebc188c600 Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/modules/mob/living/living.dm
2014-03-10 21:59:58 -05:00
ZomgPonies
b03493fbae Efficiency: Joblist
Conflicts:
	code/__HELPERS/global_lists.dm
2014-03-10 21:57:36 -05:00
Ccomp5950
051e2f0ce3 Server log files are now sorted when using .getruntimelog or .getserverlog 2014-02-28 22:37:36 -06:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Ccomp5950
f071421552 Runtime fix: Null isn't really that sharp.
runtime error: Cannot read null.sharp
proc name: is sharp (/proc/is_sharp)
  source file: unsorted.dm,1270
  usr: Arthur Ward (/mob/living/carbon/human)
  src: null
  call stack:
is sharp(null)
the police tape (/obj/item/tape/police): breaktape(null, Arthur Ward (/mob/living/carbon/human))
the police tape (/obj/item/tape/police): attack hand(Arthur Ward (/mob/living/carbon/human))
Arthur Ward (/mob/living/carbon/human): UnarmedAttack(the police tape (/obj/item/tape/police), 1)
Arthur Ward (/mob/living/carbon/human): ClickOn(the police tape (/obj/item/tape/police), "icon-x=16;icon-y=10;left=1;scr...")
the police tape (/obj/item/tape/police): Click(the floor (172,128,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=10;left=1;scr...")
2014-02-24 01:39:25 -06:00
Ccomp5950
8ef2e10237 This reverts commit all the say code changes over the last couple of days.
Except for the removal of the redundant get_mobs_in_view used for bolding ghosts text.
2014-02-22 03:46:10 -06:00
Ccomp5950
92e0c60126 Remove clients removal derp. 2014-02-22 02:50:49 -06:00
Ccomp5950
6dc330a398 Bugfix: get_mobs_in_view won't allow AIeyes to hear chat.
Also:  Added a client check to saycode for now that stops runtimes when you have a dead body with no client and removed colons from it.
herp derp.
2014-02-21 21:29:34 -06:00
Ccomp5950
440f784c70 Bugfix: People unable to hear while in certain locations. (And some debug verbs)
...hopefully
2014-02-21 02:11:11 -06:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
Ccomp5950
04a0537b1f Compile fix / optimizations
Removed client check from mob so that if a pAI is being held by a SSD client it can still hear.

Removed 3rd deep .loc check 2 is plenty, and was making the proc rather expensive
(if you shove a pAI in a bag and toss the bag into a locker, the pAI will be deaf, you jerk).
2014-02-19 00:12:14 -06:00
Ccomp5950
0ec00981f8 Unintended feature/bug.
Players viewing through security cameras can hear, this is a bit to powerful.

So removing, it's easy to readd the feature later on.
2014-02-18 20:00:16 -06:00
Ccomp5950
af19351608 Further optimizations, no need to loop through items with multiple istype checks 2014-02-18 06:51:45 -06:00
Ccomp5950
4e09cf33ac Code effeciency project: /proc/get_mobs_in_view
Before:  Everytime you say something. This proc is ran.  Along with it, recurses through EVERY /obj/ & /mob/ in view's contents, and EVERY /obj/ & /mob/ in that contents...and once again.

After:  Fuck recursion, we're going to loop through clients and see if they are within any obj's or mobs within one iteration.  MUCH cheaper, and probably less buggy.

If someone can't hear everyone and they are within an object and it's not catching?  add it to the list commented for it of type checks.
2014-02-18 02:11:59 -06:00
Segrain
54d2a261f3 Helper for cycling through list. 2014-02-03 05:02:18 +03:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs
Character setup underwear rendering
2014-02-01 14:58:38 -08:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen
Also culled unused underwear names from global_lists.dm
2014-02-01 17:53:13 +13:00
Rob Nelson
56e4b11ec5 Dynamic loading of posters
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00