76ef8c710c
Merge pull request #8689 from PsiOmegaDelta/SecLevels
...
Allows admins to more easily set security levels.
2015-04-02 23:43:26 +03:00
c4a10f05b1
Allows admins to more easily set security levels.
...
Also alters the sound for code delta.
2015-03-31 14:32:28 +02:00
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03: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
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
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
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
139edb4f9b
Fixed up some boilerplate.
2015-03-26 23:24:56 +10:30
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +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
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
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
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
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
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
5fa66b2a8a
Changes to aooc
2015-03-09 22:59:52 +03:00
e4e8ef3392
Merge remote-tracking branch 'upstream/dev' into admin_stuff
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-03-09 18:11:10 +03:00
a9b30da7cc
Small correction
2015-03-09 16:53:08 +03:00
ca07914424
Ability to search bans by bantype
2015-03-09 15:15:08 +03:00
59a113f91c
Ability to search bans by ip and id, and also matches
2015-03-09 15:12:51 +03:00
64d6012399
Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.
...
If however an admin attempts to add a manual ban for a player who was present during the current round, a player who still has a mob somewhere in the game world, the proc will prioritize the mob's ip and computer id variables, not the things entered in the banning panel form.
2015-03-09 15:08:47 +03:00
d8c2a36f9f
Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
...
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +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
44c7b2367a
Admin verbs and white/blacklisting or races.
...
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
2015-03-08 12:25:34 +01:00
1984ef6e51
Master into dev-freeze.
2015-03-07 11:33:39 +10:30
ebabf53c6d
Staff now have a "re-admin self" button after de-admining themselves.
...
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
2015-03-05 11:05:58 -05:00
df689a4f72
Increased check_rights flexibility.
...
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
2015-03-01 15:29:17 +01:00
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
e47c45591c
Fixes a few issues with noise-language.
2015-02-23 18:58:41 +00:00
3ae3ef7961
Merge remote-tracking branch 'upstream/dev' into runtime
2015-02-22 21:13:20 -05: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
69284990a3
Merge remote-tracking branch 'upstream/dev' into runtime
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/cat.dm
2015-02-15 22:24:36 -05:00
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
Chinsky