Commit Graph

721 Commits

Author SHA1 Message Date
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
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
mwerezak
590ff03c86 Changes last debug verb to proc and adds it to debug list 2014-09-15 23:31:55 -04:00
PsiOmega
bd1e55f19f Changes 3 debug verbs to procs and adds them to the debug-verb list. 2014-09-13 15:49:04 +02:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Mloc-Argent
11ba197b30 fix for contaminants not processing if air is OK otherwise
also a small fix for VV

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-03 19:00:00 +01:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
mwerezak
9d7c5dc197 Gives filters proper names, updates airlocks to use filters
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Zuhayr
f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
Zuhayr
3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Mloc-Argent
deb923ec70 added debugging verb support for gas_data
Updates mod_list() with associative editing support.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 22:54:12 +01:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Zuhayr
d02e370830 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 2014-07-21 19:02:38 +09:30
Loganbacca
e05b5c0bfb Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00