cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,766 Commits 66 Branches 25 Tags
0e4c2430d164300a02c55981414b807dfd6c1b6e
Commit Graph
26766 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr 0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-18 11:59:50 -07:00
Zuhayr 8592f38e65 Merge pull request #10719 from Zuhayr/dev-freeze 
Dev freeze
 2015-08-17 19:29:18 -07:00
Zuhayr a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00
Zuhayr 1b7f8d7be2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-18 11:32:46 -07:00
Zuhayr 71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
Zuhayr f2b2f2a22c Merge pull request #10711 from PsiOmegaDelta/150817-RandomShuttles 
Admin level doors are now always of the secure variant.
 2015-08-17 19:02:20 -07:00
GinjaNinja32 29be304c89 Merge pull request #10640 from Karolis2011/map_capture 
Added map capture tool
 2015-08-18 02:51:56 +01:00
Zuhayr b6e7d33f3d Merge pull request #10715 from GinjaNinja32/irc 
Adds settable rank to IRC messages, changes it so non-admins can see …
 2015-08-17 18:51:53 -07:00
Zuhayr 5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode 
Gamemode fixes
 2015-08-17 18:50:58 -07:00
mwerezak 87da0d4eb5 Fixes missing ), "spam" class 2015-08-17 21:24:59 -04:00
GinjaNinja32 f0c8db3d0f Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs 2015-08-18 02:16:50 +01:00
mwerezak 3ea5bfb131 Makes error message print to admins instead of world 2015-08-17 21:12:40 -04:00
mwerezak e84f693219 Fixes certain antag roles from being unspawnable 
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
 2015-08-17 21:11:57 -04:00
mwerezak dadc6e4b77 Adds logging for admin spawning antags 2015-08-17 21:10:24 -04:00
mwerezak e1f4551693 Fixes revs being unspawnable 
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
 2015-08-17 21:04:23 -04:00
mwerezak ef8e3a94a0 Fixes antag datum not respecting restricted_jobs depending on config 
Fixes #10657
 2015-08-17 21:00:22 -04:00
PsiOmega 439b976272 Admin level doors are now always of the secure variant. 
Players keep finding ways to surprise.
 2015-08-17 22:41:19 +02:00
mwerezak b24e691b8c Merge pull request #10683 from SomeoneElse2/dev 
Research minor fixes, fix item design path definition, macro usage
 2015-08-17 14:23:00 -04:00
Chinsky a4550dd957 Merge pull request #10699 from PsiOmegaDelta/150817-Robofite 
Harm icon state consistency.
 2015-08-17 20:32:41 +03:00
mwerezak ddeb384a68 Merge pull request #10695 from PsiOmegaDelta/150817-48by48 
Adds 48x48 option to Icons dropdown menu
 2015-08-17 13:22:41 -04:00
GinjaNinja32 e596d3bdd6 Merge pull request #10681 from mwerezak/lighting 
Ports fix for #10660
 2015-08-17 14:17:53 +01:00
Zuhayr 9d735d97e5 Merge pull request #10704 from PsiOmegaDelta/150817-SpoonRevoltOf91 
Utensil knives and spoons are no longer contraband.
 2015-08-17 05:30:19 -07:00
PsiOmegaDelta 673664efd6 Changelog entry. 2015-08-17 13:23:59 +02:00
PsiOmegaDelta c82a0291e4 Utensil knives and spoons are no longer contraband. 
After careful considerations by the council the law concerning Possession of a Controlled Utensil is finally abolished.
The Dinnerware vending machine now offer both utensil knives and spoons without first having to hack them.
 2015-08-17 13:22:41 +02:00
Zuhayr b9c95148fd Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment 
fix access artifacts from #9263
 2015-08-17 04:06:06 -07:00
Zuhayr 0e6a184f10 Merge pull request #10703 from GinjaNinja32/cryostorage 
adds admin logs to cryostorage
 2015-08-17 04:05:46 -07:00
GinjaNinja32 7bdbb72731 Change all misc research doors and windoors to require one of access_tox or access_robotics, rather than only access_tox or access_research 2015-08-17 11:51:05 +01:00
GinjaNinja32 0c8a2b16e0 adds admin logs to cryostorage 2015-08-17 11:34:26 +01:00
Zuhayr e61eb26da9 Merge pull request #10701 from GinjaNinja32/virus 
fix #10692
 2015-08-17 03:11:16 -07:00
Zuhayr b27811ee07 Merge pull request #10700 from GinjaNinja32/locket 
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
 2015-08-17 03:04:42 -07:00
GinjaNinja32 a2817d9b8c fix #10692 2015-08-17 10:54:51 +01:00
GinjaNinja32 4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
PsiOmegaDelta 332f227444 Changelog entry. 2015-08-17 11:06:21 +02:00
PsiOmegaDelta edebf946d8 Harm icon state consistency. 
All icon states relating to the I_HARM intent now all use the same naming convention.
 2015-08-17 10:16:39 +02:00
PsiOmegaDelta 70e99875e0 Merge pull request #10698 from PsiOmegaDelta/dev 
Dev
 2015-08-17 09:51:03 +02:00
PsiOmegaDelta a0b2b8b28e Updates changelog. 2015-08-17 09:44:54 +02:00
PsiOmegaDelta 74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
PsiOmegaDelta 680e81718b Merge pull request #10697 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-08-17 09:43:00 +02:00
PsiOmegaDelta 9c08b58534 Code relocation. 2015-08-17 09:38:34 +02:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmegaDelta b062b59200 Merge pull request #10696 from PsiOmegaDelta/master 
Updates changelog.
 2015-08-17 09:36:04 +02:00
PsiOmegaDelta 3f1a974ac8 Updates changelog. 2015-08-17 09:31:33 +02:00
PsiOmegaDelta 73088ca1e7 Adds 48x48 option to dropdown menu. 
Port of https://github.com/ParadiseSS13/Paradise/pull/1733.
 2015-08-17 09:27:08 +02:00
Zuhayr 82a368c0c4 Merge pull request #10690 from NullSnapshot/hotfix 
Bandaid fix for process scheduler bloating status tab
 2015-08-16 23:54:34 -07:00
Zuhayr 3d3a54c188 Merge pull request #10691 from PsiOmegaDelta/150817-ConcernFix 
Adjusts Bump flags to make ALLMOBS mean all mobs.
 2015-08-16 23:40:51 -07:00
NullSnapshot e99f98e13f No need for the statpanels. 2015-08-16 23:24:25 -07:00
PsiOmegaDelta 9d0c072b4a Adjusts Bump flags to make ALLMOBS mean all mobs again. 2015-08-17 08:06:42 +02:00
NullSnapshot 438837a9be Moves ProcessScheduler list to new Processes tab. 2015-08-16 22:46:18 -07:00
PsiOmegaDelta 1dcdb423c7 Merge pull request #10685 from mwerezak/skipjack 
Fixes
 2015-08-17 06:56:50 +02:00
GinjaNinja32 917f6f0250 Add Medical Equipment access to Chemists 2015-08-17 05:45:34 +01:00