cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,723 Commits 8 Branches 0 Tags
fa92cdeeda4574b494d1dbdbb59ae50f50c14c37
Commit Graph

23668 Commits

Author SHA1 Message Date
Neerti
d3126ad10b Merge pull request #2180 from Yoshax/presentsoffood 
Cargo fixes + Shipping stuff
 2016-07-23 16:34:24 -04:00
Neerti
4eb5ea7721 Merge pull request #2177 from Yoshax/stamps 
New stamps for warden and cargo.
 2016-07-23 16:33:41 -04:00
Neerti
875e5c2779 Merge pull request #2176 from Yoshax/typofix 
Grammar fix + Ensures Christmas drop pod has trees
 2016-07-23 16:33:17 -04:00
Yoshax
1fc10eaddb Adjusts surplus crates 2016-07-23 21:15:44 +01: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
Yoshax
baa25044c3 Ensures drinking glasses have a cost in the autolathe 2016-07-23 20:15:22 +01:00
Yoshax
fcf34eb54b Puts a couple of crates into the right file 2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71 Converts the empty box supply crate into a shipping supplies crate 2016-07-23 20:05:59 +01:00
SinTwo
eb120319eb Frame code cleanup 2016-07-23 13:31:30 -04:00
comma
2fc033ee0e Ports /vg/ get_turf 
Gotta go faster.
Possibly undocumented behaviour of get_step?
 2016-07-23 18:00:50 +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
Peter Mörck
88c82dfe65 New stamps for warden and cargo. 
Add new stamps for warden and cargo.
Replace the stamps in their areas to the corresponding new ones.
Give captain a deny stamp.
 2016-07-23 15:42:08 +01:00
Yoshax
079ce6a71f Grammar fix + Ensures Christmas drop pod has trees 2016-07-23 15:23:54 +01:00
Screemonster
efc795473b Adds Flowey, Malfunctioning Flower, Soviet, Holly and Hilly sprites/options, and enables existing fish tank display. 2016-07-23 09:21:15 +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
fad919c039 Adds telecrystal teleporting 2016-07-23 00:27:17 +01:00
Neerti
d659dd9208 Merge pull request #2171 from redstryker/Flannel_fix 
Fixes Flannels.  Also adds a Brown Flannel
 2016-07-22 19:22:44 -04:00
Yoshax
3f0a95ae3a Ensures there's no funny business with powering up emags 2016-07-22 23:05:54 +01:00
redstryker
dccc6f5713 Fixes Flannels. Also adds a Brown Flannel 2016-07-22 16:09:51 -04: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
EmperorJon
68f83c3c9e Merge pull request #2163 from Neerti/7/22/2016_ghost_texting 
Communicator Texting for Ghosts
 2016-07-22 19:33:46 +01:00
Neerti
c185b7c22b Merge pull request #2165 from Yoshax/removebucklecuffing 
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
 2016-07-22 14:21:31 -04:00
Yoshax
b2a704904c Removes adverse effects to Tajaran drinking coffee 2016-07-22 18:07: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
Yoshax
1d0da51005 Does the old in 'n out 2016-07-22 16:11:45 +01: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
Neerti
3e19b337de Merge pull request #2157 from redstryker/SG_Logo 
Adds SolGov Logo to Paperwork and SolGov Stamps
 2016-07-22 01:26:03 -04:00
Neerti
d12e9ac5fa Merge pull request #2161 from Yoshax/bigtrio 
Makes FBP burn repair actually work
 2016-07-22 01:25:47 -04:00
Yoshax
3a953d895f Fixes undislocation 2016-07-22 04:19:49 +01:00
Yoshax
d4d76b07a7 Makes FBP burn repair actually work 2016-07-22 03:57:29 +01:00
Yoshax
c0a60faf73 Merge pull request #2159 from Neerti/7/21/2016_technomancer_additions 
Technomancer Additions/Fixes
 2016-07-21 23:38:21 +01:00
Neerti
09a57710a2 Technomancer Additions/Fixes 
Moves spell HUD so it doesn't cover instability warning.
Makes Instability radiate out towards other humans at sufficently high amounts.  People radiating instability will glow purple light.  It is adviced to keep your distance or you will get instability as well.
Mark can no longer be cast on the admin z-level.
Adds Gambit, a spell which will randomly give you (almost) any spell that exists.
Shield now causes a bit of instability when blocking.
Recall will bring anyone who is grabbed along for the ride when cast.
Disposable Teleporters now function correctly.
Instability decays faster.
 2016-07-21 18:22:15 -04:00
Cameron653
a84afa6e99 Fixes a typo preventing field gens from being bought. 2016-07-21 17:03:15 -04:00
redstryker
2e25267791 Adds SolGov logo to Paperwork and SolGov Stamps 2016-07-21 15:29:08 -04:00
Cameron653
45498c6886 Fixes a typo preventing potassium_chlorophoride from stopping the heart 
Title
 2016-07-20 21:15:02 -04:00
Yoshax
c589c0bc64 Makes secret not shit 2016-07-20 18:33:46 +01:00
EmperorJon
1334b01693 Merge pull request #2132 from Cameron653/master 
Makes biogenerator be accurate about a few product costs
 2016-07-20 12:12:07 +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
EmperorJon
c1cf145707 Merge pull request #2151 from Neerti/7/18/2016_technomancer_stuff 
More Technomancer Work
 2016-07-20 12:09:39 +01:00
EmperorJon
f11b8dffd4 Merge pull request #2152 from Mark9013100/7/19/2016uni_crate_edit 
Removes the HoS trench from the security uniform crate
 2016-07-20 12:08:10 +01:00
Mark9013100
f950b7ea23 Adds the corporate berets to loadout 2016-07-19 22:07:57 -04:00
Mark9013100
8e7b2e8fe0 Removes the HoS trench from the security uniform crate 2016-07-19 21:45:44 -04: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
Neerti
e1e0933657 More Technomancer Work 
Adds two new spells;
Track: which functions similarly to a pinpointer for technomancer objects and apprentices.  With a scepter, it will be able to track anyone as well.
Targeting Matrix: which assists in targeting with whatever is in your off-hand, for a price in instability and energy per shot.
Adds Gloves of Regeneration, which passively trades healing for hunger, as well as stabbing your hands with needles.  They also insulate your hands.
Adds Boots of Speed, which act as no-slips and make the wearer run slightly faster than normal.
Adds the new gun sounds to Audible Deception.
 2016-07-18 22:03:02 -04:00
SinTwo
cf45a827a9 final cleanup 2016-07-18 16:03:53 -04:00