cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-16 04:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,465 Commits 9 Branches 0 Tags
7fbb123a4d0fcdc4e39a8fb644a7dd8a85a76edf
Commit Graph

3483 Commits

Author SHA1 Message Date
Yoshax
7fbb123a4d Improves/fixes surplus crate item selection 2016-07-25 23:13:12 +01:00
Yoshax
f19c922984 Improves surplus crates 2016-07-25 21:45:54 +01:00
EmperorJon
9467b103bb Merge pull request #2197 from Yoshax/uplinkreduxboogalodiscount 
Reduces antag uplink discount refresh time to 10 minutes
 2016-07-25 17:54:58 +01:00
Yoshax
9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01:00
Yoshax
b041a9943b Reduces antag uplink discount refresh time to 10 minutes 2016-07-25 14:04:02 +01:00
Neerti
fc762a6e83 Merge pull request #2189 from SinTwo/item_state 
Icon Fix Fun Time
 2016-07-24 19:21:09 -04:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
Anewbe
89e98a39fb Merge pull request #2181 from Yoshax/uplinkcosttweaks 
Uplink cost tweaks
 2016-07-24 17:13:03 -05:00
EmperorJon
6838880374 Merge pull request #2020 from Yoshax/flashnerf 
Makes flashes confuse and blind the person instead of stunning
 2016-07-24 09:19:40 +01:00
Anewbe
79fda58e47 Merge pull request #2185 from SinTwo/item_state 
Item State Cleanup Fix
 2016-07-23 23:32:27 -05:00
SinTwo
8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state 
Item State Cleanup
 2016-07-23 15:53:36 -05:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
PsiOmegaDelta
76dc56bd2b Robot upgrades now checks that the upgrade type is valid. 
As opposed to the instance itself. Fixes #13652.
 2016-07-23 16:13:29 +01: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
3f0a95ae3a Ensures there's no funny business with powering up emags 2016-07-22 23:05:54 +01:00
EmperorJon
a94cad7a59 Merge pull request #2168 from Yoshax/telecrystals 
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
 2016-07-22 19:34:08 +01:00
Neerti
ae497b0dd8 Communicator Texting for Ghosts 
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
 2016-07-22 12:51:00 -04:00
Yoshax
21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
EmperorJon
683bba42ee Merge pull request #2135 from Anewbe/dual-wield_unathi 
Unathi knives can now be wielded in unison
 2016-07-20 12:11:21 +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
SinTwo
b4f85ff533 cleanup and fixes 2016-07-19 17:25:45 -04:00
Mark9013100
67279bf012 Allows belts to hold all tape rolls 2016-07-18 22:24:18 -04:00
Anewbe
9cfc9222d6 Corrects the way stunbatons check for charge on attack 2016-07-16 23:05:06 -05:00
Anewbe
a79c8d8768 Unathi knives can now be wielded in unison 2016-07-14 18:14:58 -05: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
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
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
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
1c8224fd07 Merge pull request #2028 from Anewbe/gauntlets 
Hardsuit gauntlets cover gloves
 2016-07-07 01:33:16 +01:00
Anewbe
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
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
Mark9013100
c0414d2917 Allows cards to go on the ear slot 2016-06-14 12:17:35 -04:00