cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-27 14:06:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,815 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-4
Commit Graph
43815 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ReddeyfishVorandGitHub 3e20610ef2 Add quick nif to SPAWN, MOD, EVENT_MANAGER verb sets 2018-06-13 00:07:46 -07:00
ReddeyfishVorandGitHub 0eb9218f4c Merge pull request #157 from CHOMPstation/ReddeyfishVor-patch-3 
Update Erik's medal
 2018-06-11 19:23:25 -07:00
ReddeyfishVorandGitHub dc7ff62834 Update Erik's medal 2018-06-11 18:52:13 -07:00
ReddeyfishVorandGitHub 383d82040c Merge pull request #155 from CHOMPstation/ReddeyfishVor-patch-2 
Give narration and intercom verbs to event manager
 2018-06-11 18:15:13 -07:00
ReddeyfishVorandGitHub 9119cb862d Merge pull request #156 from ReddeyfishVor/virgoPull 
Virgo pull
 2018-06-11 18:13:15 -07:00
ReddeyfishVorandGitHub 5d580b0e4c Add msay 2018-06-10 13:10:47 -07:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
ReddeyfishVorandGitHub 13b798e425 Give narration and intercom verbs to event manager 2018-06-10 11:20:36 -07:00
Cameron653andGitHub 5db710c434 Merge pull request #3817 from ArgobargSoup/master 
Adds Lynn Shady's personalized penlight
 2018-06-08 19:49:22 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub 53110dc519 Merge pull request #3832 from VOREStation/upstream-merge-5325 
[MIRROR] Changes experimental welder fluff
 2018-06-04 17:27:57 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub 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
Aronai SieyesandGitHub bc3c5f43a0 Merge pull request #3826 from VOREStation/upstream-merge-5301 
[MIRROR] Adds armor to certain mobs, mercs have knives
 2018-06-04 17:27:22 -04:00
VirgoBot 447df28e0d Ion Rifle returned to original radius. 2018-06-04 16:13:45 -04:00
MechoidandVirgoBot 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
VirgoBot 5f57b5e60f Changes experimental welder fluff 2018-06-04 16:13:35 -04:00
AnewbeandVirgoBot 1800e1696f Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 16:13:35 -04:00
VirgoBot d3dbd88259 Changes "Setup Character" to "Character Setup" 2018-06-04 16:08:13 -04:00
AnewbeandVirgoBot d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
VirgoBot 82f21ab181 Adds armor to certain mobs, mercs have knives 2018-06-03 03:58:47 -04:00
AtermoneraandVirgoBot 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 SieyesandGitHub 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
SpadesandGitHub 19cfaea56d Merge pull request #3825 from VOREStation/upstream-merge-5320 
[MIRROR] Radiation closet hood fix
 2018-06-02 18:45:36 -04:00
SpadesandGitHub 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
VirgoBot 30b08a04af Radiation closet hood fix 2018-06-02 16:23:08 -04:00
AnewbeandVirgoBot b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
VirgoBot c2c2fc77a9 Adds two new sets of robolimbs 2018-06-02 16:22:56 -04:00
AnewbeandVirgoBot fad161aeb7 Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 16:22:56 -04:00
ReddeyfishVorandGitHub 63bfb815e2 Merge pull request #153 from CHOMPstation/ReddeyfishVor-patch-1 
Add BobBright to xenomorph hybrid whitelist
 2018-06-02 12:22:53 -07:00
VirgoBot 81cf0d319a Prevent autosay() from creating/deleting AIs 2018-06-02 12:47:27 -04:00
AnewbeandVirgoBot 7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
Aronai SieyesandGitHub 6f5f636c0c Merge pull request #3819 from VOREStation/aro-planetdelay 
Planet controller startup delay
 2018-06-02 12:36:05 -04:00
pontifexminimus2andGitHub 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
ArgobargSoupandGitHub dfb52b891c Update custom_items.txt 2018-06-02 03:12:58 -07:00
ArgobargSoupandGitHub 97041f778e Add files via upload 
adding icons
 2018-06-02 03:08:28 -07:00
ArgobargSoupandGitHub 8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
ReddeyfishVorandGitHub 0644061e48 add igni to CD/HoP whitelist 2018-06-01 21:57:25 -07:00
ReddeyfishVorandGitHub 6a46237a5e Add BobBright to xenomorph hybrid whitelist 2018-06-01 21:55:01 -07:00
ReddeyfishVorandGitHub d5fef17aa9 Merge pull request #151 from CHOMPstation/ReddeyfishVor-patch-8 
Restore chomp icon and name.
 2018-06-01 21:51:04 -07:00
Aronai SieyesandGitHub 6ebcaedb43 Merge pull request #3814 from VOREStation/revert-3693-aro-visreverse 
Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)""
 2018-06-01 21:14:35 -04:00
Aronai SieyesandGitHub 40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -04:00
Aronai SieyesandGitHub e04212d616 Merge pull request #3763 from Ketrai/master 
Adds Fennix mob
 2018-06-01 10:49:02 -04:00
Aronai SieyesandGitHub 4aa17310ca Merge pull request #3808 from Novacat/MiscTweaks 
Voidsuit loadout fixes
 2018-06-01 10:48:16 -04:00
Unknown 8e60db63f9 Voidsuit loadout fixes 
- Removes duplicate helmets in EVA Bay
- Removes duplicate magboots/masks in Atmos
- Adds breath masks to EMT Voidsuits in EMT Bay
 2018-06-01 10:29:21 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub de202ea2e1 Merge pull request #3806 from VOREStation/upstream-merge-5318 
[MIRROR] Fixed xenoarch multitool being unmakeable
 2018-06-01 10:00:39 -04:00