Arokha Sieyes
c625a7515e
Tweaks digestion code
...
Makes synths digest more gracefully and actually preserves MMIs like intended
2016-06-07 18:20:52 -04:00
Arokha Sieyes
f8fe9994e5
Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update
...
# Conflicts:
# code/world.dm
# config/example/config.txt
Resolved by removing old lines.
2016-05-15 12:39:30 -04:00
Arokha Sieyes
1c77dda552
Adds centcom jobs, headset, PDA, as-of-yet unused hud_vr soon-to-be-used
2016-05-14 18:02:36 -04:00
Neerti
4656db4aa9
Adds PDA Multicaster
...
Adds a new machine to telecomms, which contains special PDAs corresponding to each department on the station. Sending a PDA message to one of these PDAs will duplicate it to everyone in the department the PDA is assigned to. It determines what department someone is in by cartridge type.
Adds cartridges for several jobs that were missing them, for the purposes of being recognized as being in a department. The cartridges otherwise do nothing.
New circuitboard to build the new pda multicaster. It can also be deconstructed with the standard machinery deconstruction steps of screwdriver > crowbar.
2016-05-12 02:50:35 -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
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Neerti
a9b2e7a61e
Merge pull request #1133 from Kelenius/coolBots
...
Overhauls bot AI
2016-03-30 02:23:28 -04:00
Yoshax
d0d3d3cb16
Merge remote-tracking branch 'upstream/master' into morepreferences
2016-03-27 00:17:24 +00:00
Datraen
c09bb6d807
Removes JSON encoding of PDA Manifest list.
2016-03-26 15:31:08 -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
Yoshax
5d9596a72d
Makes it possible to have more than 16 preferences
2016-03-21 18:56:27 +00:00
Kelenius
069a2e52a9
Fixes #1145
...
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Kelenius
0b71767b0f
Finalizes bot updates
2016-03-08 12:55:42 +03:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Neerti
23b15390dd
Merge pull request #893 from Kelenius/AIHud
...
AI hud
2016-02-26 20:31:40 -05:00
EmperorJon
c29c97dcce
Merge pull request #905 from Zuhayr/resomi
...
Seromi rename.
2016-02-06 02:24:45 +00:00
Zuhayr
19014807fd
Surface rename of Seromi to Teshari.
2016-02-06 12:50:16 +10:30
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
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
Kelenius
cf244e07d6
Mulebots are now mobs
...
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Kelenius
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6
Renaming Resomi to Seromi.
2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486
Revert "Removes Resomi."
...
This reverts commit c9f579e00a
2016-01-27 13:48:48 +10:30
Datraen
ee8b26b942
Gives telecrystals tech levels, restores PDA default to new PDA.
2016-01-08 18:06:45 -05:00
Datraen
37e1913fda
Creates telecrystal item for exchanging telecrystals between antags.
2016-01-03 01:22:48 -05:00
SinTwo
3eb9bfb45c
PDA Update Fix.
2015-12-31 18:22:47 -05:00
SinTwo
b0916167c0
Adds new PDA sprites.
2015-12-31 15:19:11 -05:00
Zuhayr
c9f579e00a
Removes Resomi.
2015-12-21 09:56:11 +10:30
Zuhayr
6e8368ac4c
Rewrote targeting.
2015-12-16 10:26:40 +10:30
Zuhayr
0148e78eda
Removed targeting.
2015-12-16 10:25:18 +10:30
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
ccomp5950
bb93245ccd
Fixes the tapping messages check.
...
The check is now in Topic() instead of being based on the href link sent.
Resolves #11039
2015-10-15 21:11:06 -04:00
Mark9013100
1eab12fc26
Two minor edits to ERT equipment
2015-10-11 00:30:10 -04:00
PsiOmegaDelta
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
f81ac77884
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed
Fixes #10729
2015-09-10 13:50:24 -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
Zuhayr
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
PsiOmega
0bd41e604b
Merge remote-tracking branch 'upstream/dev' into Backup
2015-08-30 15:55:10 +02:00
PsiOmega
e1aa20fda5
Radio changes.
...
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02: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
PsiOmegaDelta
d02108043c
Revert "IAA cartridge tweak"
2015-08-25 12:48:42 +02:00
Sligneris
d74b8f9dc3
IAA cartridge tweak
...
Adds Employment Records to IAA cartridges.
2015-08-24 21:43:39 +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
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +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
