cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,922 Commits 6 Branches 0 Tags
fd265861bcc27bc5cf4b0282e853af7c57e3802d
Commit Graph

23094 Commits

Author SHA1 Message Date
Leshana
fd265861bc Move preferences copy_to() new player mobs into the preference_setup datums. 
* The /datum/category_item/player_setup_item datums did a good job of organizing the code for loading/saving/editing preferences data, but all of the code that applies preferences to newly created player mobs was still in a single function.
* This change adds a new proc to player_setup_item datums:  copy_to_mob()  which is called from the traditional copy_to() proc, allowing each preferences datum to apply its own character data to the mob.
* This allowes new preferences to easily compartmentalize their new code.
* I also moved all the code for existing preferences from copy_to()  into the copy_to_mob() on their respective preferences datums.
 2016-06-11 23:33:48 -04:00
Yoshax
398709309d Merge pull request #1916 from Anewbe/vest_freedom 
Allows anyone who can loadout a large webbing select any large webbing
 2016-06-11 13:46:33 +01:00
Yoshax
20f93d7a1b Merge pull request #1917 from Anewbe/loadout_smokes 
Adds fine smokables to the loadout
 2016-06-11 13:46:09 +01:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks 
Ports GinjaNinja32's drinks rewrite from Bay
 2016-06-10 23:08:41 -04:00
Anewbe
c182da0fe1 Adds fine smokables to the loadout 2016-06-10 22:04:07 -05:00
Anewbe
01224f0e89 Allows anyone who can loadout a large webbing select any large webbing 2016-06-10 21:09:21 -05:00
Anewbe
c01a44f892 Adds more fishnet 2016-06-10 18:09:48 -05:00
Arokha Sieyes
34d81de406 Use correct sprite for Pros fab 
'chu gotta change these too.
 2016-06-10 15:19:31 -04:00
Datraen
78e63a00a4 Xenobio2 Update #7 (#1910) 
* Ensures cores, slimes cannot be used twice in their machines.

* Fixes xenos appearing friendly, simple_mob death problems.

Simple mobs that were dead and not of the hostile subtype wouldn't call walk(src,0), which prevents corpses from following their target.

* Cleans up trait data when a xeno or xeno product is removed.

* Slimes more likely to have amutationtoxin, consumes virusfood.

* Fixes some issues.

* Adds changelog
 2016-06-10 19:28:59 +01:00
Yoshax
4500639353 Merge pull request #1907 from Datraen/SmartFridgeUpgrade 
SmartFridge Code Simplification
 2016-06-10 16:09:46 +01:00
Yoshax
e6f097cc69 Merge pull request #1908 from VOREStation/shaddup 
"1" Spam
 2016-06-10 15:57:54 +01:00
Datraen
2d5c5a9129 Properly handles dried items, updates update_icon for drying racks. 2016-06-10 10:33:03 -04:00
Arokha Sieyes
2000f95886 "1" Spam 
Why would you do this to meeee.
 2016-06-10 09:50:54 -04:00
Datraen
f3689d0e05 Merge pull request #1904 from VOREStation/wallets 
IDs and Wallets
 2016-06-10 01:52:47 -04:00
Datraen
5c97cede59 Brings vending machine datums under a subtype of smartfridge datums. 2016-06-10 01:41:59 -04:00
Arokha Sieyes
309761f051 Mech tracking beacon 
Was unbuildable for some reason. How'd it lose the ID? And why was it all by itself in some random path and category.
 2016-06-10 00:27:49 -04:00
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Yoshax
730fceb2d7 Makes Datraen happy 2016-06-09 17:23:43 +01:00
Yoshax
52f8c6a344 Ensures retail scanners work with drinks 2016-06-09 17:08:07 +01: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
74a1b59a39 Adds IDs and Wallets 
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
 2016-06-08 19:29:47 -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
Yoshax
289f3577ce Adds straws, sticks and milkshake glasses to kitchen vendor 2016-06-07 19:34:12 +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
Yoshax
823aadaf99 Adds straws and sticks to bar vendor, also reorders the list to be nicer 2016-06-07 17:47:24 +01:00
GinjaNinja32
72e32eeed9 Fixes, change underlay icons to fit with glass icon style 2016-06-07 17:41:25 +01:00
Yoshax
3211ca961b Makes coffee cups somewhat work 2016-06-07 16:35:29 +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
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01: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