Commit Graph

359 Commits

Author SHA1 Message Date
redstryker
2e25267791 Adds SolGov logo to Paperwork and SolGov Stamps 2016-07-21 15:29:08 -04:00
SinTwo
244fb40de8 Fixes part 1 2016-06-20 23:32:18 -04:00
SinTwo
32e9c4a34b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoUI
Conflicts:
	code/game/machinery/adv_med.dm
2016-06-20 11:51:25 -04:00
SinTwo
1e2136781c Adds NanoUI for multiple computers. 2016-06-20 11:48:52 -04:00
Spades
c89752a369 Fax, Prayer, and Emergency Comms
Resolves #1862
2016-06-14 16:32:13 -04:00
SinTwo
1b80af361e Fixes fax runtimes at startup. 2016-06-02 15:10:33 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Mark9013100
03d1fbcf10 Gives the QM a proper stamp 2016-03-24 14:52:55 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Jon
dd0c03c861 Sol Government faxes now go to the Sif Governmental Authority. No more sending faxes to the UN/NATO. :P 2016-03-05 20:49:31 +00:00
Neerti
23b15390dd Merge pull request #893 from Kelenius/AIHud
AI hud
2016-02-26 20:31:40 -05:00
Kelenius
acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Kelenius
906b03e736 Gives AI the hud, sorts the verbs
Removes 'AI IM' category
Adds 'AI settings' category
Unnecessary verbs are hidden by default but can be shown/hidden again by
using a verb
2016-02-05 17:21:04 +03:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
woodratt
be97cbaf48 1.2.7 Map Fixes and sprite additions
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
2015-12-10 10:35:38 -08: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
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