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
30,892 Commits 5 Branches 0 Tags
2000f958862992b9e175cf67db9fde5fc4bcbae4
Commit Graph

23070 Commits

Author SHA1 Message Date
Arokha Sieyes
2000f95886 "1" Spam 
Why would you do this to meeee.
 2016-06-10 09:50:54 -04:00
Yoshax
b1e78b86e8 Merge pull request #1903 from Datraen/Xenobio2Update6 
Xenobio2 Update #6
 2016-06-09 15:46:30 +01:00
Datraen
8e40ad6f49 Fixes #1899, changes name references to [src]. 2016-06-09 09:05:33 -04:00
Datraen
7670ab1ad0 Fixes #1896 2016-06-09 09:03:07 -04:00
Spades
25d61db083 Neither Travis nor Byond noticed this. Whoops! 
No one saw that! :U
 2016-06-09 01:37:54 -04:00
Spades
1e831112cf Fixes #1830 2016-06-09 01:29:16 -04:00
Arokha Sieyes
c86ede43bd log_debug, even better. 2016-06-08 02:49:54 -04:00
Arokha Sieyes
a5995b8e21 Don't echo things to everyone on the server 
Nobody knows what to do about your hung object processing, sry.
 2016-06-08 02:47:34 -04:00
Neerti
945753fcac Merge pull request #1891 from Yoshax/johnmayer 
Increases stun time from falling due to gravity change
 2016-06-08 01:14:59 -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
Datraen
8c50a92338 Merge pull request #1889 from Yoshax/bullets 
Fixes many dense objects from stopping penetrating bullets
 2016-06-07 18:35:22 -04:00
HarpyEagle
6888fa1982 Increases stun time from falling due to gravity change 
It was ridiculously short, and strange to watch
 2016-06-07 19:48:48 +01:00
Kearel
d21841a92e Lets spears be made from butterfly knifes as well as shards. 2016-06-07 19:42:11 +01:00
HarpyEagle
4cf0d2bad1 Fixes many dense objects from stopping penetrating bullets 2016-06-07 19:30:21 +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
Datraen
94a0e186af Now stores seeds properly by checking names and assigning names on storage, instead of just putting them all under "Fruit" 2016-06-06 22:38:09 -04:00
Datraen
fe7c079747 Merge pull request #1879 from SpadesNeil/revert-ammo-fix-p90 
Reverts ammo change, fixes P90, changes SVD mag name
 2016-06-06 22:17:01 -04:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request. 
It's just a 10 round 762 magazine. It's compatible with the STS.
 2016-06-06 22:03:03 -04:00
Anewbe
3fec6418dc Eyes and cells don't require research 2016-06-06 19:47:54 -05:00
Anewbe
1d04b9ca1f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fbp_sans_science 2016-06-06 16:39:59 -05:00
Datraen
24d5769b02 Merge pull request #1880 from PolarisSS13/05_Jun._Increase_snowflake 
Increases loadout points
 2016-06-06 11:46:28 -04:00
Anewbe
a7deb7e6aa Removes the science requirements from creating prosthetic torsos and heads 2016-06-05 22:16:50 -05:00
Spades
baf8ca5dcc These were supposed to be removed. 
We scrapped this change.
 2016-06-05 22:24:35 -04:00
Spades
3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Jon
941aadae53 Increases loadout points 10 -> 15 to account for the steady increase in items, especially those that most people want to take anyway like lunchboxes and communicators. 2016-06-05 22:44:16 +01:00
Datraen
a5c615cbd1 Merge pull request #1872 from Anewbe/energy_burst_change 
Tweaks FM-2t to possibly be usable
 2016-06-05 13:58:32 -04:00
Spades
f6497ee60d Changelog says I changed this but I didn't. 2016-06-05 13:40:37 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns 
Guns, Guns, Guns (Now in a PR less stupid)
 2016-06-05 13:25:26 -04:00
Spades
9da3e9bac7 Comment corrections to clear confusion. 2016-06-05 13:18:07 -04:00
Datraen
45e71a1825 Merge pull request #1871 from SinTwo/power_monitor_fix 
Power monitor fix
 2016-06-05 10:53:14 -04:00
Anewbe
ecc902a811 Removes species restrictions on shoes and gloves for Taj and Unathi 2016-06-04 16:05:05 -05:00
Neerti
4fec35ab91 Merge pull request #1873 from Yoshax/mapchanges 
Robotics slight adjustments
 2016-06-04 11:24:50 -04:00
Yoshax
ac3a1bd691 Robotics slight adjustments 2016-06-04 15:08:01 +01:00
Spades
037271504e No five-round burst! I thought I removed these! 2016-06-04 01:36:56 -04:00
Anewbe
cdb5966576 Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too 2016-06-03 23:58:00 -05:00
SinTwo
56b35a9528 icon update 2016-06-04 00:31:15 -04:00
SinTwo
dc29227895 Fixes power monitor computer screens 2016-06-03 22:10:52 -04:00
Arokha Sieyes
15fdb5eb1b Synth gets hit by axe? Internal bleeding. 
That'sa-no-good.
 2016-06-03 21:18:24 -04:00
Spades
15f555b0fa Okay I lied. One more commit before a dev sees. 
Soviets aren't in your lore.
 2016-06-03 21:07:56 -04:00
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -04:00
Spades
23e609ccb3 Fuckit. Silenced sound can go. It's unrealistic anyway. 
I could have fixed it but meh.
Also map cleanup.
 2016-06-03 20:37:05 -04:00
Spades
700b8b5934 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-03 20:29:19 -04:00
Spades
a063c8915e Feedback based on meeting. 
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
 2016-06-03 20:21:12 -04:00
Spades
09788190c2 Reverted autolathe changes. 
Need to fix this exploit some other way, some other day.

Also fixed some oversights.
 2016-06-03 18:22:19 -04:00
Datraen
245b353375 Merge pull request #1726 from Yoshax/dnalockframework 
Adds a framework to allow guns to be locked to dna
 2016-06-03 17:25:17 -04:00
Spades
dd0c3935e7 Gun lore updates. 
Also changed the path of the bullpup rifle.
 2016-06-03 10:33:04 -04:00
EmperorJon
fc8af33bec Merge pull request #1859 from Datraen/SmarterStorage 
Brings SmartFridges under the vending machine datum system.
 2016-06-03 14:16:23 +01:00
Spades
e0748c8261 Response to feedback. 
Tried to make descriptions better.
SAW magazine no longer fits in pockets.
 2016-06-03 01:57:13 -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