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
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
81c40c14b1
Compacts down the game panel spawn logging and makes it always notify admins.
2015-07-27 11:47:55 +02:00
34b0517578
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/topic.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/nano/modules/atmos_control.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
2015-07-17 23:19:34 +02:00
efaf8659b8
Fixes usage of isAI()
2015-07-15 15:51:11 +01:00
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
5b30703d30
Should be the last fixes needed.
2015-07-11 04:22:36 -07:00
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07:00
49ea79d0b3
Added missing return.
2015-07-09 14:40:30 -07:00
87c8be10dd
spans and grammar for topic.dm
2015-07-09 12:26:32 -07:00
909798a8ef
Actual implementation of mod_can_(job_)tempban and mod_(job_)tempban_max
2015-07-09 12:11:27 -07:00
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
14acf43646
Merge pull request #10059 from Baystation12/master
...
Dev-freeze
2015-07-09 08:34:43 +02:00
0f764d8779
Admins will no longer see stars when viewing faxes.
...
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.
Fixes #10050
2015-07-08 10:47:22 -04:00
0adebcb2bf
Admin secrets refactor.
...
Turns the entries in the secret admin secrets panel into datums, which will make it much easier to add, edit, and remove new entries.
This initial commit only contains an initial proof of concept entry implementation and the supporting code. Next commit will contain all relevant entries.
2015-07-05 20:56:29 +02:00
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
a0dcb04768
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
2bd0d7a2f4
Automatic player note fixes.
...
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
2015-06-10 17:56:31 +02:00
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
bf27545841
End game turf changes now simply alters color.
2015-05-29 23:38:09 +02:00
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
8b792b6361
Merge branch 'dev' into paper-functionality
2015-04-27 12:37:31 -04:00
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
1bd25c54e3
Add random access inserting into paper bundles
...
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.
The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
dbd239f4ec
Corrections dual sanitizing
2015-04-18 17:49:25 +03:00
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
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
61691a9603
Adds emergency message for AI
2015-04-02 21:09:48 +01: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
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
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
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
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
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
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
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
PsiOmegaDelta