cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 6 Branches 0 Tags
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

11520 Commits

Author SHA1 Message Date
Chinsky
1f76ae4250 Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516 
Teleport anomaly fix.
 2015-05-17 09:07:53 +03:00
Zuhayr
a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
Zuhayr
4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Atlantiscze
bcfbfdedba CPU Generation adjustment 
- Doubles CPU generation from APCs. Testing revealed that current values are simply too small.
- Decreases DualCPU hardware boost to +50% CPU generated (instead of +100%)
- Minor code clean-up at hardware selection screen.
 2015-05-17 02:54:58 +02:00
PsiOmega
8b39f9201a Compilation fixes. 2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-05-16 22:38:01 +02:00
Zuhayr
14df1e5fb5 Converts beds, chairs and stools. 2015-05-17 03:43:59 +09:30
Zuhayr
dbe8221c60 Merge pull request #9308 from Karolis2011/dev 
Made sorting and tagger pipes dispensible
 2015-05-17 03:23:10 +09:30
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
mwerezak
9ae57e95e1 Moves mob animations to a new source file, adds attack animation 2015-05-16 12:44:49 -04:00
Zuhayr
8f6666a32e Converted barricades to material system. 2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
PsiOmegaDelta
d4c205e12a Merge pull request #9200 from mwerezak/tail-swish 
Tail swish animations, tail icon caching
 2015-05-16 18:16:41 +02:00
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30
Karolis2011
0999f1ab78 Made sorting pipes dispesible 
also fixes #9305
 2015-05-16 17:27:39 +03:00
Zuhayr
83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
PsiOmega
21dad8bdc0 Teleport anomaly fix. 
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
 2015-05-16 14:46:57 +02:00
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
PsiOmegaDelta
98fce1fa1e Merge pull request #9301 from Kelenius/ofChemAndRuntime 
Fixes #9294
 2015-05-16 13:47:05 +02:00
Zuhayr
f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Chinsky
2359245f06 Merge pull request #9285 from mwerezak/master-fixes 
Pneumatic cannon fix
 2015-05-16 14:19:22 +03:00
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr
966d797e07 Converts bat to use the material system. 2015-05-16 19:59:21 +09:30
GinjaNinja32
137c77c19d Typo fix 2015-05-16 10:48:59 +01:00
Zuhayr
1de493c272 Fixes #9021 2015-05-16 18:45:31 +09:30
Kelenius
b4bfe917eb Fixes #9294 2015-05-16 12:05:14 +03:00
Zuhayr
36acf64f18 Partial fix for #8825 2015-05-16 18:33:03 +09:30
Zuhayr
e1a14e3c41 Removes xenoarch reconstitutors entirely. "Fixes" #5413 2015-05-16 17:40:49 +09:30
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
PsiOmegaDelta
05033b5762 Merge pull request #9278 from Ccomp5950/ravensrequest 
Admin log fix:  Something that really annoys ravensdale.
 2015-05-16 09:29:15 +02:00
PsiOmegaDelta
07cb2aa1ad Merge pull request #9291 from Techhead0/seeTheInvisible 
Invisible people can now be heard by visible_message
 2015-05-16 08:57:21 +02:00
mwerezak
413276a4c5 Allows damage to accumulate past max_damage on vital organs 
Fixes #9214
 2015-05-16 02:05:44 -04:00
Ccomp5950
10a8c56c5d Merge pull request #9286 from Zuhayr/dev 
Fixes, clothes stripping refactor.
 2015-05-16 00:53:14 -04:00
mwerezak
d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak
5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak
3e41d6ff6e Fixes crossbow icon issue 
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
 2015-05-15 23:06:29 -04:00
mwerezak
65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak
29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Techhead0
35e44ab8d9 Invisible people can now be heard by visible_message 
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
 2015-05-15 21:06:16 -04:00
ccomp5950
19cc6df391 Conversion to admin_attack_log() 2015-05-15 17:07:07 -04:00
Techhead0
ec37652997 Fixes #7999 2015-05-15 13:34:46 -04:00
Zuhayr
f021467f8b Merges two redundant procs. 2015-05-16 01:55:19 +09:30
Zuhayr
890693b839 Allowed accessories to function as custom items using icon_override 2015-05-16 01:37:04 +09:30
Zuhayr
8611499e87 Fixes #8842 2015-05-15 23:53:59 +09:30
Zuhayr
7535e027b9 Fixes #9192 2015-05-15 23:53:38 +09:30
Zuhayr
f65c4e95f6 Fixes #9060 2015-05-15 23:38:01 +09:30
Zuhayr
325bd42c66 Fixes #9233 2015-05-15 23:37:52 +09:30