d3a1ddfa09
Thermal/NVG changes.
...
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
2015-04-05 09:54:55 +02:00
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
9ad533a094
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -04:00
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
ba9b8756da
Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file
2015-03-29 01:52:26 -04:00
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
d8018db5c9
Finally got things working from vote to roundstart to join to death.
2015-03-21 11:14:59 +10:30
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
a41434331f
Add middle mouse button action for buildmode
...
Middle Mouse Button on buildmode button= On/Off object type saying"
Middle Mouse Button on turf/obj = Capture object type"
2015-03-15 22:22:25 +02:00
5fa66b2a8a
Changes to aooc
2015-03-09 22:59:52 +03:00
c7573a0d11
Antag-OOC
2015-03-09 12:19:50 +03:00
2ad8d26aeb
Play server sound verb for admins
2015-03-09 12:19:47 +03:00
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
f0a5dae1c4
Icarus cannon admin logs.
2015-02-20 19:54:15 +01:00
9c45f000ec
Merge with dev.
2015-02-16 20:34:07 +10:30
08635587e1
Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
...
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
0d89717cf2
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
01798c98b6
Rewrites syringe and dart guns
2015-02-13 01:34:35 -05:00
c953e279a4
Update from dev.
2015-02-12 23:15:47 +10:30
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
08b26e8e4c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-11 14:35:58 +10:30
ab6f0bf30c
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/clothing/under/ties.dm
code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
fc6dfb5f1b
Ammo magazine and casing update
...
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
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
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
c5e2feb5f1
Merge with dev.
2015-02-05 20:24:06 +10:30
7d502aa255
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-04 07:40:20 -08:00
fdf0360a69
Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.
2015-02-04 10:55:33 +10:30
2e275d7e5e
Area cleanup part 1: Engineering Department
2015-02-03 14:50:11 -08:00
536388978f
Conflict fix
2015-02-03 20:57:16 +03:00
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
8898689c5d
Cleared out my WIP folder.
2015-02-03 03:20:42 -07:00
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
8abd7d0735
correction of all copytext(sanitize(..)) to sanitize(copytext(..))
2015-02-01 22:54:56 +03:00
b23b5b5d41
Removes categorization of Ahelps.
2015-01-31 21:13:05 -05:00
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
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
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
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
360775b96f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 00:01:09 +10:30
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
a3dc661c62
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-12-10 18:50:31 +10:30
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +10:30
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
371bdb10d9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-08 13:03:20 +10:30
117dd18284
Adjusted ninja spawn proc to check rig internals.
2014-12-07 20:13:59 +10:30
a4f1c617b8
Allow typing all arguments to adminhelp
2014-12-05 17:06:16 +00:00
PsiOmega