Zuhayr
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
Chinsky
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
GinjaNinja32
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
PsiOmega
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
Zuhayr
f74182680c
Fixes autotraitor.
2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28
More debug feedback.
2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03
Added debug verbs/feedback.
2015-09-05 12:05:32 +09:30
Zuhayr
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
PsiOmegaDelta
0ab507ccec
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 09:03:49 +02:00
PsiOmegaDelta
0bf3c39095
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 07:59:49 +02:00
PsiOmegaDelta
631c30732d
Adds admin message log to the spawn verb.
...
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
2015-07-27 11:24:44 +02:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
Zuhayr
d3bd63eec9
Refactor/tidies up latejoin antags/in-round antag spawning.
2015-06-21 19:33:49 +09:30
PsiOmegaDelta
b7c9969f87
Corrects mob reference.
2015-06-10 11:35:00 +02:00
PsiOmegaDelta
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
PsiOmega
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
mwerezak
0725b0cc3e
Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments
2015-06-06 11:53:12 -04:00
Chinsky
e5a8eb2dfc
Actually renames 'going' var.
...
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
PsiOmegaDelta
fcb0841646
Reduction of admin right-click verbs.
...
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627 .
Fixes #9628 .
2015-06-02 14:20:14 +02:00
GinjaNinja32
5ebece6368
Spawn fixes
...
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
2015-06-02 02:24:32 +01:00
Zuhayr
59af7e5c4d
Refactor/rewrite of custom item spawning.
2015-05-12 15:14:51 +09:30
volas
9fadad7b33
Player age now displayed also in notes
2015-05-09 19:33:11 +03:00
PsiOmega
82a8f32783
Admins can now toggle LOOC separately from OOC.
...
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
PsiOmega
a6a9cb76e8
Ghost-possession sanity checks.
...
Adds sanity checks referred to in #8849 .
2015-04-15 16:10:36 +02:00
PsiOmega
f9b3547e8d
Allow admins to drag-drop ghosts into mobs.
...
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
2015-04-15 08:49:00 +02:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
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
GinjaNinja32
e47c45591c
Fixes a few issues with noise-language.
2015-02-23 18:58:41 +00:00
Zuhayr
c953e279a4
Update from dev.
2015-02-12 23:15:47 +10:30
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
Zuhayr
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +10:30
Zuhayr
43802dceb7
Removed TRAIT_LIFESPAN.
2015-02-04 10:49:30 +10:30
Zuhayr
78e61d9ccd
Tweaks to xenoflora, added plant icons and colours to all plants.
2015-02-04 10:42:39 +10:30
Zuhayr
b791c92c6e
Added a fruit spawning debug proc.
2015-02-04 10:37:40 +10:30
Loganbacca
fbabdce615
Finished renaming nuclear mode to mercenary
...
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13:00
Zuhayr
8ec096581c
Fix for blood drip overlaying + secret feature
2015-01-15 20:10:32 +10:30
Zuhayr
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
GinjaNinja32
e473e3d2ba
Fix compile error due to depending on #7267
2014-12-07 17:23:30 +00:00
GinjaNinja32
9e2cf5266c
Allow forcesay with no client, add language toggles to player panel
2014-12-07 17:08:36 +00:00
Amunak
faf9d34895
Renamed the .admin class to .log_message, which better describes its purpose
2014-11-28 10:26:10 +01:00
Zuhayr
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
DJSnapshot
e212b4170b
R_HOST is now a thing. Also allows gives headmins a global note remove.
2014-11-17 02:23:04 -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
