cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,737 Commits 5 Branches 0 Tags
a2a2f58e93c0a47a4c657e6edfe6dd9ebbaad19c
Commit Graph

31737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anewbe
a901482f8a Merge pull request #2245 from PolarisSS13/revert-2175-AI_displays 
Revert "Additional AI status displays"
 2016-07-31 23:17:21 -05:00
Anewbe
6b0704f10f Adds pepperspray and a crowbar to the HoS locker 2016-07-31 23:05:38 -05:00
Neerti
1744b09d67 Revert "Additional AI status displays" 2016-07-31 23:49:31 -04: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
Yoshax
6ac20b0053 Further uplink item changes. Attempts to reduce the price of some of the more potentially interesting items in an attempt to see them used more often. 2016-07-31 15:23:13 +01:00
Yoshax
dc7e196c82 Corrects surplus crate pricing to scale rewards the more you spend. Proper description can be found in the commit description. 
120 TC - 240 Worth - 2x Worth
240 TC - 540 Worth - 2.25x Worth
480 TC - 1200 Worth - 2.5x Worth
720 TC - 1980 Worth - 2.75x Worth
 2016-07-31 15:19:31 +01:00
Yoshax
62709429ed Adds "syndicate" dufflebags to the uplink 2016-07-31 14:53:23 +01:00
Spades
2d91d68fb6 Let's try this again. (#2236) 2016-07-31 13:50:37 +01:00
Yoshax
2548ca4a1e Merge pull request #2237 from Anewbe/suit_cooler_fix 
Suit coolers now work while worn on the back
 2016-07-31 13:41:43 +01:00
Anewbe
3795e5c52a Suit coolers now work while worn on the back 2016-07-31 00:15:42 -05:00
Anewbe
8d2f1731c6 Merge pull request #2234 from PolarisSS13/revert-2224-mapfix-sec-escape-pods 
Revert "Fixes two issues on map for Security"
 2016-07-30 20:13:40 -05:00
Yoshax
7dc9038765 Revert "Fixes two issues on map for Security" 2016-07-31 01:59:30 +01:00
SinTwo
ed308dcae2 makes atms, apcs, and space heaters use tgui + changelog 2016-07-30 20:34:46 -04:00
Yoshax
76e9a5cba6 Merge pull request #2233 from Yoshax/changelogs 
Updates changelog
 2016-07-31 01:04:57 +01:00
Yoshax
93e5ff5a9d Updates changelog 2016-07-31 00:54:02 +01:00
Yoshax
5c422da5bc adds a door 2016-07-31 00:51:06 +01:00
Yoshax
b6d1571429 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into mapping 2016-07-31 00:44:58 +01:00
Yoshax
80fc24e92a Merge pull request #2222 from SpadesNeil/ammo-mag-pixel-offset 
Ammo mags offset when spawned
 2016-07-30 23:21:47 +01:00
Yoshax
2b0769ea39 Merge pull request #2224 from SpadesNeil/mapfix-sec-escape-pods 
Fixes two issues on map for Security
 2016-07-30 23:21:40 +01:00
Yoshax
5bb1726da2 Merge pull request #2231 from Anewbe/shield_spray 
Sprays now respect blocking
 2016-07-30 22:55:44 +01:00
SinTwo
b42d46205f more time proc call fixes 2016-07-30 17:39:47 -04:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
Anewbe
a9b093bcec Sprays now respect blocking 2016-07-30 02:16:25 -05:00
Anewbe
3c98df0a07 Merge pull request #2229 from Neerti/7/28/2016_more_technomancer 
Technomancer Additions Yet Again
 2016-07-29 17:18:37 -05:00
Yoshax
033e77d6ba Adds a new maintenance tunnel 2016-07-29 14:37:12 +01:00
Spades
1d03e1de2e Fixes the horrible lighting in the briefing room 2016-07-28 20:41:47 -04:00
Spades
4b02301701 Escape pod fix 2016-07-28 20:35:19 -04:00
Spades
e91d0ddf29 pixel_x and pixel_y now have some offset 2016-07-28 19:57:34 -04:00
Anewbe
a3bebc8b21 Merge pull request #2219 from Yoshax/hardcorerepairxxxx 
Halves cable amount required for deep intensive FBP/robotic stuff repair
 2016-07-28 11:07:52 -05:00
Yoshax
755b9f0788 Halves cable amount required for deep intensive FBP/robotic stuff repair 2016-07-28 15:48:13 +01:00
Neerti
a0b46a79ee Technomancer Additions Yet Again 
Adds cores and other belongings to the tracking list for Track.
Cores worn or held by nontechnomancers cause instability buildup.
Frost Aura glow is now blue and not red.
Illusions can now do emotes as well as talk.
Illusion talking shouldn't be ruined due to double sanitize.
Phase Shift should work properly now.
Freedom and explosive implants can be bought in the catalog.
 2016-07-28 01:06:33 -04:00
SinTwo
fe46fac5cc final new NanoUI fixes and tgui port 2016-07-27 23:01:26 -04:00
Anewbe
fffd8f2899 Merge pull request #2217 from Woodratt/1.5.6_Grenadebuff 
Grenade Buff
 2016-07-27 19:30:06 -05:00
Anewbe
c9c7077c55 Merge pull request #2216 from Yoshax/changelogeriino 
Removes the delay from opening and closing hidden walls
 2016-07-27 19:23:29 -05:00
Anewbe
afaa35a5e6 Merge pull request #2215 from Yoshax/ammoprices 
Adjusts the uplink ammo costs
 2016-07-27 19:23:07 -05:00
woodratt
4a4b481d32 Grenade Buff 
Tweaked the code some, changed the number of fragments spawned from 50 to 63. Damage remains the same, fragments now have a thirty percent armor pen. This also means that how lethal grenades are has gone up by a lot. One landing at your feet is lethal. Standing next to one will seriously hurt. Tile or two back the dropoff is still in effect.

Basically need some live testing in round with real folk to get a idea of how bad or good this will be. Will likely need to tweak the damage downwards instead of upwards.
 2016-07-27 17:05:17 -07:00
PsiOmegaDelta
d2b4db716d Ports Paradise's 510 scheduler. 
Conflicts:
	code/__defines/btime.dm
	code/__defines/process_scheduler.dm
	code/_helpers/time.dm
	code/controllers/ProcessScheduler/core/_stubs.dm
	code/controllers/ProcessScheduler/core/processScheduler.dm
	polaris.dme
 2016-07-27 17:20:37 -04:00
Yoshax
5ea796d344 Removes the delay from opening and closing hidden walls 2016-07-27 21:46:18 +01:00
Yoshax
e864ada371 Adjusts the uplink ammo costs 2016-07-27 21:42:36 +01:00
Neerti
e1ee974e20 Merge pull request #2214 from Yoshax/packagebombs 
(Re-)adds package bombs
 2016-07-27 16:26:44 -04:00
SinTwo
0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl
 2016-07-27 16:11:55 -04:00
Yoshax
a38f63b495 Adds changelog 2016-07-27 14:23:42 +01:00
Neerti
485fb8def5 Merge pull request #2213 from Anewbe/rig_access 
Adds access requirements to EVA and Medical hardsuits
 2016-07-27 00:15:12 -04:00
Yoshax
29ad42fea7 Does some stuff 2016-07-27 05:11:12 +01:00
Yoshax
a75ded3fab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into packagebombs 2016-07-27 04:41:22 +01:00
Anewbe
09d5f4afcb Adds access requirements to EVA and Medical hardsuits 2016-07-26 20:47:16 -05:00
Neerti
b37b9bc945 Merge pull request #2211 from Yoshax/furtherblacklist 
Blacklists teleporter board in uplinks for random item
 2016-07-26 15:30:08 -04:00
Yoshax
c022725717 Blacklists teleporter board in uplinks for random item 2016-07-26 20:22:05 +01:00
Yoshax
829ac652b4 Re-add package bombs 2016-07-26 20:18:39 +01:00