cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,629 Commits 9 Branches 0 Tags
7cd1442e8fce024fbe802eceb6488e4c2da18b58
Commit Graph

32342 Commits

Author SHA1 Message Date
Atermonera
7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
Aronai Sieyes
d669d8a97f Merge pull request #3851 from VOREStation/upstream-merge-5333 
[MIRROR] Mining turf overlays should be properly placed now
 2018-06-11 06:12:24 -04:00
Aronai Sieyes
6b55a44254 Merge pull request #3850 from VOREStation/upstream-merge-5336 
[MIRROR] Cult robes use the right sprite again
 2018-06-11 06:11:30 -04:00
Aronai Sieyes
3ba9361c77 Merge pull request #3849 from deathride58/dispvoreprefs 
Adds a button to view the mechanical voreprefs of a mob when examining
 2018-06-11 06:11:20 -04:00
Aronai Sieyes
44500587f9 Merge pull request #3846 from Nepoox/master 
Adds Annie's pullover (Fluff Item)
 2018-06-11 06:10:38 -04:00
Aronai Sieyes
a2f8abd12c Merge pull request #3841 from VOREStation/upstream-merge-5334 
[MIRROR] Ater forgot to remove debug code
 2018-06-11 06:08:49 -04:00
Aronai Sieyes
97465264c3 Merge pull request #3840 from VOREStation/upstream-merge-5323 
[MIRROR] Wallet money spawns as a bundle.
 2018-06-11 06:08:31 -04:00
Aronai Sieyes
d8a7328dac Merge pull request #3839 from VOREStation/upstream-merge-5331 
[MIRROR] Fix #5316 and #5220
 2018-06-11 06:08:09 -04:00
Aronai Sieyes
6e1fd34d33 Merge pull request #3838 from VOREStation/upstream-merge-5330 
[MIRROR] Fix #5321
 2018-06-11 06:07:34 -04:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810) 
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
 2018-06-11 06:06:49 -04:00
Aronai Sieyes
884a4ec99c Merge pull request #3820 from Novacat/nova-pathfinder 
Pathfinder Fixes
 2018-06-11 06:04:42 -04:00
Nepoox
8ff967eeec Changed name and description 2018-06-09 23:19:57 +02:00
Atermonera
aca81ab59c Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 15:42:55 -04:00
Atermonera
876068eeda Merge pull request #5336 from Anewbe/cult_robe_sprite_fix 
Cult robes use the right sprite again
 2018-06-09 15:40:38 -04:00
deathride58
7c55a4f817 don't code on 48 hours of sleep deprivation - fixes bolding in vorepref display, makes simpleanimal examine a little more compact 2018-06-09 07:41:52 -04:00
deathride58
d78a1ef8ed And here, too! the /human subtype completely overrides the /atom/movable examine() 2018-06-09 07:05:53 -04:00
deathride58
2118a4ce73 adds a button to view the mechanical vore prefs of a mob when examining 2018-06-09 07:00:44 -04:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02:00
Cameron653
5db710c434 Merge pull request #3817 from ArgobargSoup/master 
Adds Lynn Shady's personalized penlight
 2018-06-08 19:49:22 -04:00
Anewbe
178cffe6de Merge pull request #5334 from Atermonera/aters_a_donk_round2 
Ater forgot to remove debug code
 2018-06-06 20:37:32 -04:00
Atermonera
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 19:08:31 -04:00
Anewbe
8144628015 Merge pull request #5331 from Mechoid/SmallAnomalistFixes 
Fix #5316 and #5220
 2018-06-06 18:50:45 -04:00
Anewbe
4cfabdc9a4 Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst 
Fix #5321
 2018-06-06 18:50:34 -04:00
Aronai Sieyes
3106baef73 Merge pull request #3833 from VOREStation/upstream-merge-5326 
[MIRROR] Ion Rifle returned to original radius.
 2018-06-04 17:28:07 -04:00
Aronai Sieyes
53110dc519 Merge pull request #3832 from VOREStation/upstream-merge-5325 
[MIRROR] Changes experimental welder fluff
 2018-06-04 17:27:57 -04:00
Aronai Sieyes
632300ceeb Merge pull request #3831 from VOREStation/upstream-merge-5327 
[MIRROR] Changes "Setup Character" to "Character Setup"
 2018-06-04 17:27:47 -04:00
Aronai Sieyes
f88524ca61 Merge pull request #3824 from VOREStation/upstream-merge-5319 
[MIRROR] Adds two new sets of robolimbs
 2018-06-04 17:27:32 -04:00
Mechoid
6e99a135e3 Ion Rifle returned to original radius. (#5326) 
* Return ion rifles to their intended 3x3 rather than 5x5.

* Changelog
 2018-06-04 16:13:45 -04:00
Anewbe
1800e1696f Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 16:13:35 -04:00
Anewbe
d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Atermonera
76c8e20e2a Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 03:58:47 -04:00
Aronai Sieyes
b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305 
[MIRROR] Prevent autosay() from creating/deleting AIs
 2018-06-02 19:03:02 -04:00
Spades
19cfaea56d Merge pull request #3825 from VOREStation/upstream-merge-5320 
[MIRROR] Radiation closet hood fix
 2018-06-02 18:45:36 -04:00
Spades
631c91bfa2 Merge pull request #3821 from pontifexminimus2/aronaiistormentingmeandmakemeinstallweirdprogramspleasesendhelp 
Assorted Zorren changes to make them in line with the lore I set up.
 2018-06-02 18:31:41 -04:00
Anewbe
b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
Anewbe
fad161aeb7 Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 16:22:56 -04:00
Anewbe
7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
pontifexminimus2
3ea860ae99 Typo 
Oops, that doesn't belong there...
 2018-06-02 18:32:42 +02:00
pontifex2
2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up. 
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
 2018-06-02 18:28:44 +02:00
Arokha Sieyes
27de80991a Fix the New() on this interfering with my work! 2018-06-02 11:27:46 -04:00
Arokha Sieyes
29004fe093 Planet controller startup delay 2018-06-02 11:06:53 -04:00
Unknown
f81760da5b Pathfinder Fixes 
- Adds missing icons for other species in the Explorer suit cycler
- Fixes slot issue with drop straps and metal necklaces
- Pathfinder's Office can now only be accessed by the Pathfinder
 2018-06-02 10:54:17 -04:00
ArgobargSoup
8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
Aronai Sieyes
40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -04:00
Aronai Sieyes
e04212d616 Merge pull request #3763 from Ketrai/master 
Adds Fennix mob
 2018-06-01 10:49:02 -04:00
Aronai Sieyes
2e8bfbc588 Merge pull request #3807 from VOREStation/upstream-merge-5314 
[MIRROR] Fix surgery breaking bones when performed correctly
 2018-06-01 10:00:49 -04:00
Aronai Sieyes
de202ea2e1 Merge pull request #3806 from VOREStation/upstream-merge-5318 
[MIRROR] Fixed xenoarch multitool being unmakeable
 2018-06-01 10:00:39 -04:00
Aronai Sieyes
4141fc0b42 Merge pull request #3805 from VOREStation/upstream-merge-5313 
[MIRROR] Move character join log statement
 2018-06-01 10:00:29 -04:00
Anewbe
a751fbb3ee Merge pull request #5314 from VOREStation/pol-encasedfracture 
Fix surgery breaking bones when performed correctly
 2018-05-31 22:06:59 -04:00
Anewbe
007bccc2ef Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix 
Fixed xenoarch multitool being unmakeable
 2018-05-31 21:34:44 -04:00