Commit Graph

205 Commits

Author SHA1 Message Date
PsiOmega
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
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
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
PsiOmegaDelta
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
PsiOmega
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
PsiOmegaDelta
b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
Zuhayr
cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality
Paper functionality additions
2015-04-29 02:46:21 +09:30
Daranz
8b792b6361 Merge branch 'dev' into paper-functionality 2015-04-27 12:37:31 -04:00
mwerezak
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
PsiOmega
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
PsiOmega
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
Daranz
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
mwerezak
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
volas
dbd239f4ec Corrections dual sanitizing 2015-04-18 17:49:25 +03:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +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
Yoshax
61691a9603 Adds emergency message for AI 2015-04-02 21:09:48 +01:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
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
mwerezak
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
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
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +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
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +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
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
volas
ca07914424 Ability to search bans by bantype 2015-03-09 15:15:08 +03:00
volas
59a113f91c Ability to search bans by ip and id, and also matches 2015-03-09 15:12:51 +03:00
errorage
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
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
mwerezak
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
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
mwerezak
58bb2f22cd Implements making friends with Runtime 2015-01-25 02:39:40 -05:00
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
GinjaNinja32
48a8acad52 Removes some world<< statements 2014-12-07 23:06:49 +00:00
GinjaNinja32
9e2cf5266c Allow forcesay with no client, add language toggles to player panel 2014-12-07 17:08:36 +00:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
mwerezak
348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00