SinTwo
976847a0b4
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
...
Conflicts:
code/modules/clothing/head/jobs.dm
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
icons/mob/suit.dmi
icons/mob/uniform.dmi
icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
Anewbe
b08ddfefff
Fixes lighters being able to ignite people while off.
2016-07-12 22:13:04 -05:00
SinTwo
91b6ca3d7b
item states are awful
2016-07-12 23:02:29 -04:00
SinTwo
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
EmperorJon and GitHub
32129232b7
Merge pull request #2086 from Neerti/7/10/2016_freezer_fixes
...
Freezer Fixes
2016-07-10 10:56:59 +01:00
Neerti
e9dd848cf1
Freezer Fixes
...
Freezer crates, freezer boxes, cryobags, and medical grippers now properly preserve organs, as well as organs attached to organs.
Cleans up storage.dm slightly by removing loc setting with forceMove(), for the above to work.
2016-07-10 03:00:25 -04:00
Yoshax
c60407e6f4
Adds fifty stacks for all material stacks and makes drop pod actually drop fifties
2016-07-10 03:40:24 +01:00
EmperorJon and GitHub
108a8743f5
Merge pull request #2070 from Anewbe/pry
...
Adds a pry var to objects, which checks if the obj can open doors
2016-07-09 10:36:50 +01:00
Anewbe
d932462f4f
Foam axes don't shatter windows
2016-07-09 00:37:36 -05:00
Anewbe
f27fa6cc2b
Adds a pry var to objects, which checks if the obj can open doors
2016-07-09 00:24:12 -05:00
Jon
88debefe3e
The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call!
2016-07-08 16:07:34 +01:00
Yoshax and GitHub
1c8224fd07
Merge pull request #2028 from Anewbe/gauntlets
...
Hardsuit gauntlets cover gloves
2016-07-07 01:33:16 +01:00
Arokha Sieyes
484fb96202
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
# Conflicts:
# .travis.yml
# code/game/machinery/adv_med.dm
# code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Anewbe and Yoshax
f375595d30
#MoreDice2016 ( #2016 )
...
* Adds more dice
* Adds sprites, fixes some pathing
2016-07-03 19:48:28 +01:00
Anewbe
1d9e7cd95b
Fixes
2016-07-02 21:25:38 -05:00
Yoshax
33900c60f2
Makes flashes confuse and blind the person instead of stunning
2016-07-01 20:07:20 +01:00
Datraen
ccda51ab68
Adds fluff antag factions, antag visibility options for uplinks.
...
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
2016-06-29 11:25:52 -04:00
Yoshax and GitHub
563022808d
Merge pull request #1991 from aztectornado/stack
...
Clicking a stack no longer transfers one sheet at a time.
2016-06-27 19:46:12 +01:00
Techhead0 and Patch
deaac36479
Clicking a stack no longer transfers one sheet at a time.
2016-06-27 11:30:55 -05:00
Datraen
39e1a36a54
Fixes implants not receiving messages, converts them to absolute proc pathing.
2016-06-26 23:55:48 -04:00
HarpyEagle and Yoshax
36e53d4b98
Fixes disarm-attacking being very likely to break the limb before dislocating it.
...
Also makes it possible to 'strike to cripple' with stunbatons
2016-06-19 23:58:16 +01:00
Richard D'angelo
7ab5220f64
510 Improved Overlays
...
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.
I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.
Ported from:
https://github.com/Baystation12/Baystation12/commit/7c2cc890abf840b1a9967bc26c36581301e7229c
2016-06-18 15:50:10 -03:00
HarpyEagle and Yoshax
58b87f1a4b
Adds do_surgery() behaviour for various items
...
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
2016-06-17 19:06:56 +01:00
HarpyEagle and Yoshax
fc063115df
Makes do_surgery() into an item proc, refactors medical stack application
...
Surgery is now handled before attack() is called, no need to check that in attack()
2016-06-17 18:08:36 +01:00
Arokha Sieyes
c15c4da829
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2016-06-14 16:48:00 -04:00
Mark9013100
c0414d2917
Allows cards to go on the ear slot
2016-06-14 12:17:35 -04:00
Arokha Sieyes
0350a266d1
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/modules/client/preferences.dm
2016-06-14 12:01:42 -04:00
EmperorJon and GitHub
388ec9cb11
Merge pull request #1931 from VOREStation/videocalls
...
Adds actual video calls to communicators
2016-06-14 01:31:40 +01:00
Yoshax
fdc8b33b2c
Adds towels to fitness vendor, color is randomised
2016-06-13 20:19:52 +01:00
Arokha Sieyes
878cf928f8
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# .travis.yml
# vorestation.dme
2016-06-13 13:12:40 -04:00
Arokha Sieyes
b624e7703a
Adds actual video calls to communicators
...
'chu heard me. S'what it does. When you're on a call, there's a "Start Video" button next to each person. When you click it, you actually look through their thing, like a ghost might if they ghostcalled. You have to stay within 1 tile of a video showing communicator to see it.
Multiple people can share one communicator video stream by setting it on a table or whatever, and examining it. There's a message like "It appears to be showing a video: [view]" and you can click view and you can all look at the video. COLLABORATION. SYNERGY. OTHER BUZZWORDS.
I also added the feature of DECLINING requests from people.
Also communicators show up on a special camera list on security consoles, but the same EPv2 network visibility turns this off as well if you wanna be all hidey. This does mean that people with the visiblity on serve as sort of roaming AI cameras for the AI as well. So the AI can watch you repair the outside of the station or whatever if you want.
2016-06-13 02:55:05 -04:00
Datraen and GitHub
36fd6fb4d6
Merge pull request #1926 from VOREStation/emotes
...
Rewrites Emotes + LOOC and makes Communicators work
2016-06-12 12:46:02 -04:00
Yoshax and GitHub
1155aabb05
Merge pull request #1927 from VOREStation/exofbp
...
Makes suit coolers work right in mecha
2016-06-12 15:59:40 +01:00
Arokha Sieyes
22e2352925
Makes suit coolers work right in mecha
...
2 year old typo
Fixes #1924
2016-06-11 23:30:41 -04:00
Arokha Sieyes
7b4d571889
Makes communicators great again
2016-06-11 22:05:01 -04:00
Datraen and GitHub
299059a5be
Merge pull request #1883 from Yoshax/drinks
...
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
Arokha Sieyes
08972b1dc5
Better, now.
2016-06-09 18:28:16 -04:00
Arokha Sieyes
3e5faabe0c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sank
2016-06-09 01:00:07 -04:00
Arokha Sieyes
74a1b59a39
Adds IDs and Wallets
...
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
2016-06-08 19:29:47 -04:00
Spades
4b9eeec946
Merge pull request #320 from VOREStation/synthgurgles
...
Tweaks digestion code
2016-06-08 13:36:15 -04:00
Neerti
fa5dd08f2f
Merge pull request #1893 from Yoshax/spears
...
Spear fix + a change
2016-06-08 01:14:05 -04:00
Yoshax
d076962c51
Spear fix + a change
2016-06-08 03:54:44 +01:00
Arokha Sieyes
eb6f979fc0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# vorestation.dme
2016-06-07 18:37:47 -04:00
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
Kearel and Yoshax
d21841a92e
Lets spears be made from butterfly knifes as well as shards.
2016-06-07 19:42:11 +01:00
GinjaNinja32 and Yoshax
debfd3dabf
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-06 20:33:11 +01:00
Spades
aa2c74aef5
Replaced mobs with vore versions.
2016-06-03 22:57:51 -04:00
Datraen
fbb0f764d2
Adds a missing (src)
2016-06-02 18:12:21 -04:00
Arokha Sieyes
42107cda37
Fixes CentCom IDs.
2016-06-01 23:06:10 -04:00
Yoshax
f75d509e7f
Ports event system from Bay
2016-06-01 22:05:04 +01:00
SinTwo