cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 16:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,766 Commits 66 Branches 25 Tags
0e4c2430d164300a02c55981414b807dfd6c1b6e
Commit Graph
12246 Commits
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 a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00
Zuhayr 71214d859e Merge with master. 2015-08-18 11:31:10 -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
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 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
GinjaNinja32 e596d3bdd6 Merge pull request #10681 from mwerezak/lighting 
Ports fix for #10660
 2015-08-17 14:17:53 +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 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 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +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
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
PsiOmega 4d826e68cb Mob bump fixes. 
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
 2015-08-16 20:55:02 +02:00
SomeoneElse 9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros 
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
 2015-08-17 00:25:37 +06:00
mwerezak b21bd0c42d Ports fix for #10660 from vg 
Courtesy of PJB3005
 2015-08-16 14:24:44 -04:00
GinjaNinja32 f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay 
Synth say fixes.
 2015-08-16 14:55:04 +01:00
GinjaNinja32 0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay 
Makes the private AI channel truly private.
 2015-08-16 14:53:38 +01:00
PsiOmega 21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
PsiOmega 0b01482eb6 Synth say fixes. 
Adds synth message sanitizing. Fixes #10667.
Makes sure say() code at least to some degree returns expected values. Fixes #10675.
 2015-08-16 14:00:29 +02:00
Zuhayr 0c2d0852ae Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration 
Round Duration display
 2015-08-16 03:40:23 -07:00
PsiOmega 13076b6f55 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-16 10:32:06 +02:00
PsiOmegaDelta 7b5b7162d0 Merge pull request #10673 from Baystation12/master 
Dev-freeze
 2015-08-16 10:30:13 +02:00
PsiOmegaDelta 311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix 
Fixes overdose not working for ingested reagents
 2015-08-16 10:18:16 +02:00
GinjaNinja32 7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates 
Computers are now overlay based.
 2015-08-16 00:40:47 +01:00
Zuhayr eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr 7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega 1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
Chinsky 7241c2f2d1 Merge pull request #9947 from mwerezak/breacher 
Makes unathi breachers fit unathi only
 2015-08-15 22:04:36 +03:00
mwerezak 5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
Karolis2011 84a9fd2927 Removed ingame capture link generation and fixed some bugs. 2015-08-15 14:04:25 +03:00
Kelenius cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius 3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
Karolis2011 9ea9490332 Added map capture function. 2015-08-15 12:39:07 +03:00
PsiOmega 4cf736bb5c Compilation fix. 2015-08-15 11:12:43 +02:00
PsiOmega c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-08-15 11:06:03 +02:00
PsiOmega 395df6d9c2 Compilation fixes. 2015-08-15 10:58:32 +02:00
PsiOmega cda0ecfa97 Relocates Malfunction code to appropriate location. 2015-08-15 10:52:39 +02:00
PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
Snapshot 3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix 
Fixes #10621
 2015-08-14 22:51:43 -07:00
Snapshot 5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak 3163de7a50 Fixes #10621 
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
 2015-08-14 23:44:46 -04:00
Chinsky 4ba0a65420 Merge pull request #10648 from mwerezak/circuit-printer 
Fixes #10637
 2015-08-15 06:37:31 +03:00
mwerezak a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
mwerezak 133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00