cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,253 Commits 8 Branches 0 Tags
87929b51d0d461efa153d00ad1dac553b38bfc8d
Commit Graph

28032 Commits

Author SHA1 Message Date
Anewbe
87929b51d0 Merge pull request #5343 from ReddeyfishVor/slimeChanges 
prevent slimes from spawning on top of people
 2018-06-11 13:10:24 -05:00
Anewbe
58cca27282 Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 17:48:04 -07:00
Atermonera
6f5491de67 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 12:41:06 -07:00
Atermonera
e7ea5b1c69 Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 12:38:58 -07:00
Reddeyfish
0a616af465 prevent slimes from spawning on top of people 2018-06-10 11:42:42 -07:00
Atermonera
456a1aa37e Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 12:42:10 -07:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05:00
Anewbe
a8be0c1c82 Change-Eye-Color verb should work again 2018-06-08 18:54:49 -05:00
Anewbe
284b60212b Cult robes use the right sprite again 2018-06-06 21:33:30 -05:00
Anewbe
73b4b3fe50 Merge pull request #5334 from Atermonera/aters_a_donk_round2 
Ater forgot to remove debug code
 2018-06-06 19:37:02 -05:00
Atermonera
ee6a7125cf Ater forgot to remove debug code 2018-06-06 16:59:17 -07:00
Anewbe
7d23980df4 Mining turf overlays should be properly placed now 2018-06-06 18:09:07 -05:00
Atermonera
82628ef097 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 16:07:53 -07:00
Anewbe
935cfaec3c Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst 
Fix #5321
 2018-06-06 17:49:49 -05:00
Mechoid
d159528899 Fix #5316 and #5220 2018-06-05 20:59:12 -07:00
Mechoid
b455abf2b6 Fix https://github.com/PolarisSS13/Polaris/issues/5321 2018-06-05 20:29:59 -07:00
Anewbe
eb0ead6785 Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 15:13:19 -05:00
Mechoid
35e974e3a0 Ion Rifle returned to original radius. (#5326) 
* Return ion rifles to their intended 3x3 rather than 5x5.

* Changelog
 2018-06-04 15:13:10 -05:00
Cameron653
b8008e454b Changes Setup Character" to "Character Setup" 
Since that's what is used everywhere else.
 2018-06-03 15:32:42 -04:00
Atermonera
493a497d25 Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 00:58:07 -07:00
elgeonmb
e537e9b8e8 you made me do this 2018-06-02 17:56:47 -07:00
Anewbe
237db1e90e Wallet money spawns as a bundle. 2018-06-02 16:16:54 -05:00
Anewbe
c8919e0c9f Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 15:22:15 -05:00
Anewbe
9d44725112 Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 15:22:05 -05:00
Anewbe
5ee264dc21 Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 11:46:38 -05:00
Arokha Sieyes
53cb0b70a5 Radiation closet hood fix 2018-06-01 23:52:00 -04:00
SubberTheFabulous
4c6f5add29 Two new unbranded prosthesis 2018-06-01 23:15:25 +07:00
Anewbe
83286102e0 Merge pull request #5314 from VOREStation/pol-encasedfracture 
Fix surgery breaking bones when performed correctly
 2018-05-31 21:06:49 -05:00
Anewbe
768773b82a Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix 
Fixed xenoarch multitool being unmakeable
 2018-05-31 20:33:22 -05:00
Anewbe
720f7b2352 Merge pull request #5310 from Heroman3003/arcade-fix 
Fixed arcades dispensing their own board
 2018-05-31 20:32:40 -05:00
Anewbe
61be543800 Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 20:32:12 -05:00
Heroman3003
77a00e53d1 fixed xenoarch multitool being unmakeable 2018-05-31 13:01:40 +10:00
Mechoid
8178c2bf1f Merge pull request #5289 from fludd12/splat 
Prometheans can now be revived as originally intended.
 2018-05-30 18:13:26 -07:00
Arokha Sieyes
48bf825472 Fix surgery breaking bones when performed correctly 
I have to believe this is somehow misplaced. "Whoops!"
 2018-05-29 14:40:54 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Anewbe
9fad848847 Merge pull request #5308 from VOREStation/pol-mineoverlays 
Rewrite mine turf overlay adding
 2018-05-29 13:32:39 -05:00
Anewbe
fe65dd22a4 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 13:32:21 -05:00
Anewbe
66ceb6862a Merge pull request #5311 from VOREStation/pol-proxghosts 
Fixes #5083
 2018-05-29 13:31:57 -05:00
Arokha Sieyes
fb9bfd8639 Move character join log statement 
Was only logging latejoins due to where this line was placed. Moved it into job controller to catch any time anyone is assigned a job period.
 2018-05-29 14:26:23 -04:00
Leshana
30f10be83e Split and clarify global lists of processing vs non-processing machinery. (#5307) 
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
 2018-05-28 12:56:49 -07:00
Atermonera
1a42238ac3 Merge pull request #5306 from VOREStation/aro-spaceinit 
Move space/New to space/initialize
 2018-05-28 12:50:05 -07:00
Arokha Sieyes
0283074785 Fixes #5083 
This whole HasProximity() thing should be redone at some point. We discovered earlier that every atom moving into every turf notifies every atom/movable in the surrounding 8 turfs that it's now moved into the turf. Which is silly. There's like 4 things that use the system, including prox sensors.
 2018-05-27 21:40:45 -04:00
Heroman3003
0001b3fe38 Fixed arcades dispensing their own boards. 2018-05-28 09:51:32 +10:00
Heroman3003
2f0d9aab04 Fixed watermelon not having kitchen_tag 2018-05-28 09:33:10 +10:00
Arokha Sieyes
3827307e59 Rewrite mine turf overlay adding 
Stop adding overlays on adjacent turfs. Just add them on yourself, and push them sideways.
 2018-05-27 16:27:02 -04:00
Leshana
0994c9dbe7 Removes the global lists all_clothing, all_items, all_objs, and all_atoms for performance reasons. 
- The cost of maintaining these lists is more than the benefit of having them (mostly used only for debugging code)
 2018-05-27 15:20:40 -04:00
Arokha Sieyes
03111ab249 Move space/New to space/initialize 
I'm not sure how you expect starlight to work when you're checking for neighbors that don't exist yet.
 2018-05-27 14:02:34 -04:00
Arokha Sieyes
da2bb9567e Prevent autosay() from creating/deleting AIs 
Now it gets one dedicated AI it can move around instead.
 2018-05-27 14:01:43 -04:00
drexample
be5c144a16 Ports Baystation12 newest item pickup animations. Fancy! (#5302) 
* fixed photos

* Added item pick up animation

* Revert useless commit

* Removed unnecessary extra define, made sure ghost object deletes itself after animation, changed planes.
 2018-05-27 11:54:36 -05:00
Anewbe
06e2ab736c Merge pull request #5303 from VOREStation/pol-AEcanary 
Active edge canary PR
 2018-05-27 11:50:59 -05:00