Arokha Sieyes
aaeae6695a
Make planets more generic
...
So that Sif doesn't have to be the only one!
2017-04-14 21:36:48 -04:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Anewbe
7bb3f5fbb7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# code/datums/supplypacks/medical.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/modules/clothing/shoes/miscellaneous.dm
# code/modules/clothing/suits/labcoat.dm
# icons/mob/back.dmi
# icons/mob/feet.dmi
# icons/mob/human_face.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/storage.dmi
# maps/northern_star/polaris-2.dmm
# maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Leshana
a5a805414b
Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
...
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not. The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Anewbe
25b925f04c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
...
# Conflicts:
# maps/northern_star/polaris-1.dmm
# maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
Neerti
d398367e4c
Fixes a world << that crept in and apparently new lobby code.
2017-02-20 19:29:13 -05:00
Neerti
836d8dfa3f
More stuff, finalizes it I hope.
2017-02-20 18:28:31 -05:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
Anewbe
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
Anewbe
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
Anewbe
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05:00
Spades
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
SinTwo
a2a2f58e93
Fixes #2352
2016-08-27 13:44:32 -04:00
PsiOmegaDelta
c6105e01a0
Adds missing error handler that made it difficult to debug runtimes.
2016-08-25 18:21:55 +01:00
SinTwo
eabefc538a
Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
...
This reverts commit 6bb5409349f6a83d5ee0
2016-08-15 12:58:00 -04:00
SinTwo
4fa126b7e7
a whole lot of nanoui upgrades
2016-06-24 00:43:16 -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
Datraen
e1c0256477
Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system.
2016-04-05 14:44:31 -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
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -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
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00: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
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Kelenius
f106b3f26b
Removes cloaking device
...
Adminspawn-only device that is never used, but every time a human
updates icons, they check if they have one. Neat!
2016-02-08 14:28:54 +03:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Zuhayr
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
GinjaNinja32
be2279106f
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
code/modules/admin/view_variables/topic.dm
2015-09-10 03:06:27 +01:00
MrSnapwalk
d45d46f920
Resprites, renames, and repaths the detective uniforms.
2015-08-22 19:43:28 -05:00
Zuhayr
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
GinjaNinja32
e96ff66715
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
2015-08-13 05:46:16 +01:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
PsiOmega
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
PsiOmegaDelta
f8799035f4
Merge pull request #10400 from Baystation12/master
...
Master -> Dev-Freeze
2015-08-01 19:44:22 +02:00
GinjaNinja32
495f80fff6
Change callproc to check validity earlier
...
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
2015-08-01 17:19:36 +01:00
GinjaNinja32
4e6b316a9e
Improved VV and callproc implementation
2015-07-02 09:26:10 +01: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
mwerezak
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
88b80732e7
Generalizes access definitions.
...
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
PsiOmegaDelta
fcb0841646
Reduction of admin right-click verbs.
...
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627 .
Fixes #9628 .
2015-06-02 14:20:14 +02:00
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +09:30
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
volas
84696567d8
Ability to select job equipment in 'Select Equipment'
2015-05-09 19:29:26 +03:00
ccomp5950
7436573177
Fixes the removal of all organs when admins use "Select Equipment"
...
fixes #8884
2015-05-05 21:37:28 -04:00
