cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,200 Commits 94 Branches 23 Tags
workflow
Commit Graph
644 Commits
Author SHA1 Message Date
skull132 0085f79e44 Faxes onto Discord 2016-02-16 17:42:16 +02:00
skull132 71e475cac9 +CCIAA bugs 
Fixes the following:
* CCIA Agent access on CC
* CCIAAs can now see faxes
* Sent faxes are saved properly
* "Send New Fax" hyperlink works, from the check-fax-history menu
 2016-02-10 00:54:15 +02:00
skull132 26a449b861 Merge remote-tracking branch 'Aurorastation/development' 
# Conflicts:
#	code/modules/admin/admin_verbs.dm
 2016-02-06 02:08:11 +02:00
skull132 c302fcf210 Merge pull request #60 from Ryan784/DEV-Flags 
DEV+ Flags and verbs
 2016-02-06 01:09:48 +02:00
skull132 1f7f3b1751 CCIAA - Send_admin_fax() -> create_admin_fax() & Fixes 
The proc create_admin_fax() now works fully, under all scenarios tested.
 2016-02-05 18:24:55 +02:00
Mahzel d850304ffe Update #54 - Form database 
Form database implementation.
Paper bundles update.
 2016-02-05 15:08:12 +01:00
Ccomp5950 bd60099a7e Removes unused pressure_resistance variable. 
This is used with FEA not ZAS

Though it's kind of funny to look at what some of these values were set at.
(For reference: ONE_ATMOSPHERE = 101.325)
 2016-02-03 18:17:52 -05:00
skull132 8569d1c1ab +CCIAA Flag 2016-02-02 23:37:15 +02:00
PsiOmegaDelta 1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00
GinjaNinja32 1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
 2015-12-08 08:23:10 +01:00
PsiOmegaDelta 5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
BlueNexus 050c1f631a Added a missing update_icon() 2015-12-07 11:27:33 +00:00
Karolis2011 2ecf44a665 Removed uneceserry variable 2015-11-22 13:23:45 +02:00
Karolis2011 df110f28a5 Fixes AI camera not working and moves can_capture_turf to the mob. 2015-10-10 18:43:26 +03:00
Karolis2011 414c160b9f Removed code copy paste and fixed light not showing up on images. 2015-10-10 02:58:50 +03:00
Kelenius 83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
HarpyEagle 592c824837 Changes paper and paper bundle gender, plus rename 2015-09-26 20:27:57 -05:00
Zuhayr 0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Raptor1628 a7ff1a09ee Adds Supply Fax 
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
 2015-08-31 15:32:35 -04:00
PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
Zuhayr 23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
 2015-08-21 20:27:48 +02:00
Zuhayr edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
PsiOmega d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-21 18:59:19 +02:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr 545e465dfc Added paper shredders from Minijar. 2015-08-22 02:00:08 +09:30
PsiOmegaDelta 1e7251ded4 Id card handling changes. 
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
 2015-08-21 14:04:06 +02:00
PsiOmegaDelta a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Zuhayr e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/Sleeper.dm
 2015-08-17 13:05:58 +02:00
Chinsky 3b500d4076 Merge pull request #10279 from Kearel/LibraryModifications 
Library modifications
 2015-08-13 17:47:16 +03:00
Kearel 93959dc83d Changelog + scrambled paper 2015-08-13 01:16:00 -05:00
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
PsiOmegaDelta 3bba0f95b1 Qdels the photo dummy. 2015-08-12 09:14:36 +02:00
Chinsky 076e7d6788 Merge pull request #10432 from Baystation12/dev-freeze 
Dev freeze -> Master
 2015-08-11 20:13:49 +03:00
PsiOmegaDelta edce8f73a4 Removes faulty attempt of garbage collecting. 2015-08-11 14:26:32 +02:00
PsiOmegaDelta adda1d9448 Fixes #9158. 
Neither the value True nor False are null. Removes breaking null check
 2015-08-11 14:00:13 +02:00
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
Kearel ecaf43440b Paperbin 
Adds ability to pick up paperbin by dragging it on the player.
 2015-07-26 18:58:29 -05:00
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
PsiOmega 6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
 2015-06-26 19:22:31 +02:00
mwerezak 1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
Mustafa Kalash bb370a66f3 Merge remote-tracking branch 'upstream/dev' into iaasuit 2015-06-20 14:07:44 -04:00
PsiOmega 0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00