Commit Graph

5795 Commits

Author SHA1 Message Date
Spades
fc059ab4e8 Merge pull request #397 from Cameron653/master
Egg TF revamp, adds xeno egg sprite, bug fixes, reverts #382
2016-07-03 20:10:34 -04: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
f375595d30 #MoreDice2016 (#2016)
* Adds more dice

* Adds sprites, fixes some pathing
2016-07-03 19:48:28 +01:00
Cameron653
13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04: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
Cameron653
947d1f3073 Update egg_vr.dm 2016-06-28 10:20:00 -04:00
Cameron653
720b6df5e9 Fixes #384
Fixes #384
2016-06-28 10:19:20 -04:00
Yoshax
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
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
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:

7c2cc890ab
2016-06-18 15:50:10 -03:00
HarpyEagle
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
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
Yoshax
3f9a5b9b91 no message 2016-06-16 04:34:48 +01:00
Cameron653
61d4aeced1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-15 14:30:40 -04:00
Yoshax
7d70f14f95 Makes snowy overlays have directions in the sprites instead of different obj's 2016-06-15 19:06:05 +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
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
36fd6fb4d6 Merge pull request #1926 from VOREStation/emotes
Rewrites Emotes + LOOC and makes Communicators work
2016-06-12 12:46:02 -04:00
Yoshax
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
Cameron653
4543b8c8f9 LOTS O FIXES 2016-06-11 02:30:36 -04:00
Datraen
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
d21841a92e Lets spears be made from butterfly knifes as well as shards. 2016-06-07 19:42:11 +01:00
PsiOmegaDelta
457b4cc367 Large crates now insert items on initialization.
Similar to how crates/lockers do it.
2016-06-07 19:06:45 +01:00
GinjaNinja32
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
Broseph Stylin
97a94af41a Fixes mapped-in double beds being made of steel and lacking padding. 2016-06-03 02:36:27 -03:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Datraen
be4a51eae8 Puts the qdel in initialize. 2016-06-02 14:36:53 -04:00
Datraen
804d69e965 Gives sparks a chance to qdel. 2016-06-02 14:31:20 -04:00
Neerti
a95b47174e Merge pull request #1851 from Yoshax/bugfixes
Adjusts the checks to ensure you cannot buckle two people to the same thing
2016-06-02 10:36:25 -04:00
Yoshax
4d3afc42b6 Adjusts the checks to ensure you cannot buckle two people to the same thing 2016-06-02 15:04:40 +01: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