Commit Graph

741 Commits

Author SHA1 Message Date
Zuhayr a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
SkyMarshal 84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
ccomp5950 a07e0a044f Added buttons back to Mentors
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
2015-02-07 00:04:50 -05:00
Ravensdale 7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Ravensdale 2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Kelenius 536388978f Conflict fix 2015-02-03 20:57:16 +03:00
PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
SkyMarshal 8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
Chinsky 72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
ccomp5950 b23b5b5d41 Removes categorization of Ahelps. 2015-01-31 21:13:05 -05:00
Kelenius 6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
mwerezak f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
Zuhayr 8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr 360775b96f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:01:09 +10:30
Atlantiscze 77fa2705dd Ion laws (including the "random" ones by admins) are now more visible for the AI/robots.
Because single line of text is so easy to miss in spammed chat. Now it automatically shows output of show-laws verb which is significantly harder to miss.
2014-12-17 07:43:46 +01:00
Zuhayr a3dc661c62 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-12-10 18:50:31 +10:30
Zuhayr 5730bcb885 Merged master/dev config.txt. 2014-12-10 16:35:39 +10:30
ccomp5950 3414e48ceb Adds "paranoid" option to remove more powerful debug options from R_DEBUG.
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
    Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid

    The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
2014-12-09 21:25:07 -05:00
Zuhayr 371bdb10d9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-08 13:03:20 +10:30
Zuhayr 117dd18284 Adjusted ninja spawn proc to check rig internals. 2014-12-07 20:13:59 +10:30
GinjaNinja32 a4f1c617b8 Allow typing all arguments to adminhelp 2014-12-05 17:06:16 +00:00
Amunak 4da6eeb82b Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags 2014-11-28 12:23:59 +01:00
Amunak 82322f146e Admin PM cleanup; moved styles to stylesheet.dm, added chattags 2014-11-28 12:05:11 +01:00
Amunak 9e40851998 Moved formatting of admin and mod say channels to stylesheet + added chattags
This actually removes some stuff from asay and msay. The only place where admins and mods(/mentors/whatever) are distinct now is msay, and only in name: admins have their nick colored like their OOC chat (though this can be changed in stylesheet.dm). Also added the feedback thingy proc call and did some code cleanup.
2014-11-28 12:02:04 +01:00
Amunak bf6a8c5aa5 Adminhelp refactoring, you can now type adminhelp in command box.
Formatted some code, also added a confirmation for the sender if their adminhelp looks fine.
2014-11-28 10:16:56 +01:00
PsiOmega 7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
DJSnapshot b6463cf772 fixes adminhelp to support mods as well. 2014-11-23 16:17:26 -08:00
PsiOmega c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01:00
Zuhayr f14c1e4402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-11-19 23:17:48 +10:30
Zuhayr cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
DJSnapshot 9d5ba587ac Mentors don't need faxes, communications, or prayers. 2014-11-17 15:08:36 -08:00
DJSnapshot 8c5639c720 sanity checks and other cleanliness things. 2014-11-17 14:35:24 -08:00
PsiOmega df63c63a41 Fixes #7040.
Pipes should now only be considered overlapping if they share connection types.
2014-11-17 12:27:29 +01:00
DJSnapshot 9c0ee5ad8a speshul snoflake color for anyone with +everything in their admin_rank because it was requested by headmins. 2014-11-17 02:40:56 -08:00
DJSnapshot abd3551754 headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help. 2014-11-17 01:30:21 -08:00
PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
PsiOmega 955b64e0a5 Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names. 2014-11-03 12:51:01 +01:00
PsiOmega bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
PsiOmega a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
Chinsky bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Chinsky f1f730894c Merge pull request #6789 from mwerezak/binary-talk
Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup
2014-10-20 03:50:12 +04:00
Zuhayr 99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr 840c018689 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-10-12 02:06:27 +10:30
Zuhayr 92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
PsiOmega 66483cf6dd Completes the transfer to the refreshed announcement system. 2014-10-07 13:19:20 +02:00
SparklySheep 9efc817896 Replaces Vox telebaton with a stun baton
Since the telebaton nerf, the vox lost their ability for stuns so this should give them the ability to whack folks and take prisoners again. As well, the telebaton was pretty worthless as a weapon.
2014-10-05 23:17:17 -05:00
mwerezak 3209f19304 Removes unused radio code, world print in forcesay 2014-10-01 21:49:24 -04:00
Zuhayr b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30