cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,679 Commits 66 Branches 25 Tags
eabefc538a2cf176eb619ef64daf1600aa4e674a
Commit Graph
31679 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SinTwo eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
SinTwo 6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/modules/admin/holder2.dm
 2016-08-15 12:26:53 -04:00
EmperorJonandGitHub f6a83d5ee0 Merge pull request #2326 from Hubblenaut/bottle 
Bottles will now sell for their set prices.
 2016-08-15 14:46:26 +01:00
Hubblenaut 10391e5f3b Bottles will now sell for their set prices. 2016-08-15 15:32:28 +02:00
YoshaxandGitHub 288768b903 Merge pull request #2324 from Yoshax/changelog 
Updates changelog
 2016-08-15 14:02:10 +01:00
Yoshax 9add015fe4 Updates changelog 2016-08-15 14:01:37 +01:00
EmperorJonandGitHub a0baea1855 Merge pull request #2321 from Yoshax/minergohome 
Fixes everyone and their dad having QM access
 2016-08-15 13:59:55 +01:00
Yoshax c26f9ed68b Fixes everyone and their dad having QM access 2016-08-15 13:45:36 +01:00
YoshaxandGitHub ef2f4459a9 Merge pull request #2318 from Hubblenaut/medical 
New Medical Belt Sprites
 2016-08-15 13:38:00 +01:00
EmperorJonandGitHub f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup 
Taj cleanup
 2016-08-15 11:32:05 +01:00
EmperorJonandGitHub 2810683110 Merge pull request #2319 from ColaFiend/master 
Minor text fixes.
 2016-08-15 10:04:08 +01:00
ColaFiendandGitHub 50a93f98b1 Update floor.dm 2016-08-15 09:52:38 +01:00
EmperorJonandGitHub 4a11ea2283 Merge pull request #2308 from Hubblenaut/master 
Adds a verb for toggling specific pieces of underwear
 2016-08-15 09:50:26 +01:00
Brightdawn~ b5eec907c0 Minor text fixes. 
Changes description of rainbow shoes.

Adds description for:
Potted Plant
Plating
 2016-08-15 06:31:42 +01:00
Hubblenaut 5be90d9343 New medical belt sprites 2016-08-15 03:14:02 +02:00
SinTwo 9e4d4752ac cleanup 2016-08-14 20:46:04 -04:00
NeertiandGitHub 32fcb9f6ee Merge pull request #2317 from Anewbe/access_tweaks 
Removes Chaplain morgue access
 2016-08-14 14:24:48 -04:00
Anewbe 0b9a0691d3 Removes Chaplain morgue access 2016-08-14 12:13:20 -05:00
EmperorJonandGitHub 8cfada5b94 Merge pull request #2316 from Yoshax/whiteliststuff 
Fixes change appearance not allowing people to select other species
 2016-08-14 17:39:06 +01:00
Yoshax 02c11fe87f Updates the valid species list to have all species 2016-08-14 17:24:58 +01:00
Yoshax e08a40eb76 Adds changelog 2016-08-14 17:16:16 +01:00
Yoshax 5426efcb39 Fixes valid_species having datums 2016-08-14 17:14:26 +01:00
PsiOmegaDeltaandYoshax de6d2a4a31 Fixes check_rights runtiming for non-holders. 
Fixes all kinds of errors.
 2016-08-14 16:10:39 +01:00
Yoshax cfaada473b Fixes change appearance not working for other species 2016-08-14 16:10:07 +01:00
AnewbeandGitHub 22eecefa82 Merge pull request #2315 from Yoshax/mapfix 
Fixes #2310
 2016-08-14 09:42:21 -05:00
Yoshax 3214e6a255 Fixes #2310 2016-08-14 15:09:17 +01:00
Anewbe aa81925b71 Adds Changelog 2016-08-13 23:18:51 -05:00
Anewbe 0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
NeertiandGitHub 4e37d71657 Merge pull request #2291 from Kelenius/botAccess 
Roboticists now can access bots.
 2016-08-13 20:24:35 -04:00
AnewbeandGitHub 3870349d35 Merge pull request #2309 from Yoshax/paperwork 
Refactor of admin fax handling
 2016-08-13 19:22:47 -05:00
AnewbeandGitHub ddd7239813 Merge pull request #2313 from Yoshax/dirt 
Fixes dirt
 2016-08-13 19:00:40 -05:00
NeertiandGitHub 9d9c550e48 Merge pull request #2306 from Yoshax/changelogs 
Updates changelog
 2016-08-13 14:56:09 -04:00
Yoshax cb3fd3a577 Updates changelog 2016-08-13 16:41:58 +01:00
Yoshax fdf1b67530 Fixes author name changelog 2016-08-13 16:40:30 +01:00
Yoshax d34c7434b4 Adds changelog 2016-08-13 15:32:16 +01:00
Yoshax b2ba310df0 Fixes dirt 2016-08-13 15:30:20 +01:00
NeertiandGitHub 730b6c58da Merge pull request #2154 from Yoshax/secretisdumbasshit 
Makes secret not bad
 2016-08-12 17:15:14 -04:00
NullSnapshotandYoshax 06ddbfc98d gets rid of unneeded code in adminpaper 
minor change to paper.dm fixes the issue adminpaper needed the code in.
 2016-08-12 21:58:15 +01:00
Yoshax de38b055b4 Adds ability to put the SolGov logo on the admin faxes 2016-08-12 21:58:08 +01:00
NullSnapshotandYoshax e987e2f0c4 allows check_rights to accept either mobs or clients. 2016-08-12 21:48:52 +01:00
NullSnapshotandYoshax 3345ac5cd1 gets rid of some text macros. 2016-08-12 21:36:17 +01:00
Hubblenaut c6c74c386b Adds changelog 2016-08-12 21:14:56 +02:00
NullSnapshotandYoshax d81bfe3c3e adds footer and changes fax challenge to an md5 of the game ID. 2016-08-12 20:07:15 +01:00
NullSnapshotandYoshax e881c77c8f refactors admin faxes to allow for more simple to use fax creation and replying. 
Admins also gain the ability to initiate faxes.
And mods can send and receive faxes now.
 2016-08-12 19:58:52 +01:00
Hubblenaut 2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
AnewbeandGitHub 83c515fdd9 Merge pull request #2305 from Yoshax/bugifx20 
Fixes #2303
 2016-08-11 21:17:25 -05:00
Yoshax 2163998e2f Fixes #2303 2016-08-12 03:07:16 +01:00
NeertiandGitHub 96536a7176 Merge pull request #2297 from Yoshax/bugfixboogalo 
Minor Bug Fix Boogalo
 2016-08-11 18:42:00 -04:00
AnewbeandGitHub 43e8bf8336 Merge pull request #2300 from Yoshax/cargomap 
Fixes cargo not having fifty stack sheets on spawn
 2016-08-11 16:54:48 -05:00
Yoshax e4dc0f2209 Fixes #2050 2016-08-11 22:18:10 +01:00