cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,679 Commits 8 Branches 26 Tags
eabefc538a2cf176eb619ef64daf1600aa4e674a
Commit Graph

6858 Commits

Author SHA1 Message Date
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
SinTwo
6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/modules/admin/holder2.dm
 2016-08-15 12:26:53 -04:00
EmperorJon
f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup 
Taj cleanup
 2016-08-15 11:32:05 +01:00
EmperorJon
4a11ea2283 Merge pull request #2308 from Hubblenaut/master 
Adds a verb for toggling specific pieces of underwear
 2016-08-15 09:50:26 +01:00
Yoshax
5426efcb39 Fixes valid_species having datums 2016-08-14 17:14:26 +01:00
Yoshax
cfaada473b Fixes change appearance not working for other species 2016-08-14 16:10:07 +01:00
Anewbe
aa81925b71 Adds Changelog 2016-08-13 23:18:51 -05:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Neerti
4e37d71657 Merge pull request #2291 from Kelenius/botAccess 
Roboticists now can access bots.
 2016-08-13 20:24:35 -04:00
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
Yoshax
e4dc0f2209 Fixes #2050 2016-08-11 22:18:10 +01:00
Yoshax
b72410cdef Fixes #2254 2016-08-11 22:04:57 +01:00
Yoshax
733450f46b Fixes #2271 2016-08-10 23:48:02 +01:00
SinTwo
f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm
 2016-08-09 15:46:24 -04:00
Yoshax
6e2d7587ad Revert "Fixes lung rupturing" 2016-08-09 15:41:10 +01:00
Kelenius
763c7376d4 Roboticists now can access bots. 2016-08-09 07:10:16 +03:00
Anewbe
16f18b10a7 Merge pull request #2288 from Yoshax/lungruptuing 
Fixes lung rupturing
 2016-08-08 17:13:38 -05:00
Yoshax
daa49ced44 Shamelessly steals HarpyEagle's code 2016-08-08 20:45:53 +01:00
Yoshax
e9e51ccb02 Fixes lung rupturing 2016-08-08 15:47:53 +01:00
EmperorJon
8110fbbf3c Merge pull request #2232 from SinTwo/scheduler 
510 scheduler
 2016-08-08 10:36:36 +01:00
Anewbe
9f7b77d933 Merge pull request #2274 from SinTwo/miscfixes 
Minor Fixes
 2016-08-05 16:35:09 -05:00
SinTwo
a17d42a84c mode name and ert sechud fix 2016-08-05 16:27:07 -04:00
Screemonster
c59a41c830 Adds ian, runtime, poly, pun pun, and generic human, unathi, tajara, tesharii and skrell sprites to the list of hologram options. 2016-08-05 18:02:28 +01:00
Anewbe
4ce94fbaed Fire hurts 2016-08-03 21:12:16 -05:00
Anewbe
88b7f0e678 Fixes does_not_breathe, Toggle breathing is an active power (#2240) 
* Fixes does_not_breathe

* Fixes things, Changelings can toggle breathing

* Changelog
 2016-08-02 18:41:24 +01:00
Yoshax
221a245e0d Removes embedded objects causing toxin damage when moved 2016-08-02 02:55:10 +01:00
Yoshax
2047eefa73 Makes wound bleed again 2016-08-01 21:13:16 +01:00
Yoshax
770880dd3d Updates Tajaran species description 2016-08-01 15:45:29 +01:00
Yoshax
4779026748 Merge pull request #2242 from Neerti/7/31/2016_technomancer_fixes 
Technomancer Fixes
 2016-08-01 01:18:13 +01:00
Neerti
3d11717d13 Technomancer Fixes 
Unstable Aura will no longer do a hundred times its intended damage.
Gambit should no longer give base spell templates.
Wards should die properly now.
Track will no longer list the user as a valid option.
Shields should now stop projectile effects like stunning, if blocked.
 2016-07-31 20:08:10 -04:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
SinTwo
fe46fac5cc final new NanoUI fixes and tgui port 2016-07-27 23:01:26 -04:00
Yoshax
f90f2ec08a Fixes some items on working on people on tables 2016-07-26 03:10:54 +01:00
Anewbe
38c043e566 Merge pull request #2204 from Yoshax/accuracypenalty 
Increases accuracy penalties in detrimental states
 2016-07-25 16:44:46 -05:00
Yoshax
927c90c105 Increases accuracy penalties in detrimental states 2016-07-25 16:18:33 +01:00
Yoshax
1f81596f6a Makes security bots more hardy to be less useless 2016-07-25 14:48:35 +01:00
Neerti
c71863dd5d Adds Slowdown for Pulling Heavy Items 
Makes dragging items which would have slowed you down if worn or carried slow you down when dragged, fixing an exploit where one could move faster by dragging something instead of carrying or wearing it.
 2016-07-25 03:51:45 -04:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2016-07-22 23:39:19 -04:00
Yoshax
f493ac7e17 Removes debug lines 2016-07-22 15:53:54 +01:00
Yoshax
013a509b17 Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting 2016-07-22 15:48:47 +01:00
Yoshax
3a953d895f Fixes undislocation 2016-07-22 04:19:49 +01:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/clothing.dm
 2016-07-19 17:37:14 -04:00
Jon
31e66c0037 Fixes vomiting. 2016-07-18 19:12:12 +01:00
Neerti
ef8a9dd5e0 Teshari Now Have Upper Bodies 
Fixes a long standing bug.  Turns out BP_CHEST is undefined and the compiler never caught it for some reason.
 2016-07-16 23:26:23 -04:00
Neerti
728cd2bdd3 Adds accuracy penalties for certain detrimental states. 
Being blind gives an additional 75% chance to miss.
Having blurry eyes gives an additional 15% chance to miss.
Being confused gives an additional 30% chance to miss.

This was done so that if the PR for flashes to apply these effects instead of a stun are merged, they would hopefully still be useful if someone is trying to robust you.  Melee and ranged penalties should be equivalent, despite different numbers due to how the different code works.
 2016-07-14 06:19:49 -04:00
Neerti
b0321958d1 Merge pull request #2115 from Yoshax/ED-Emag 
Ensures security robots can be properly emagged
 2016-07-13 19:14:23 -04:00
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
Neerti
334f24730e Merge pull request #2124 from Yoshax/hair 
Adds a new hairstyle
 2016-07-13 14:41:46 -04:00
Neerti
f2e0462dcb Merge pull request #2123 from Yoshax/languages 
Makes languages great again
 2016-07-13 14:38:33 -04:00
Yoshax
f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00