cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,914 Commits 10 Branches 0 Tags
cf5dff8a717ef18c81bcf9b87efa98575b48ec67
Commit Graph

16444 Commits

Author SHA1 Message Date
Hubblenaut
8120a9b77f Makes kicks and stomps their own unarmed_attack types 2014-12-15 18:54:07 +01:00
Chinsky
7683086619 Merge pull request #7464 from Zuhayr/dev-freeze 
Fixes (at least some) of the recursive power-drain crash issues.
 2014-12-15 16:38:40 +03:00
PsiOmega
8aa5ee4d9a Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-15 08:58:28 +01:00
PsiOmega
f65ac4350f Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-15 08:56:11 +01:00
PsiOmegaDelta
845b858045 Merge pull request #7466 from GinjaNinja32/ninjas 
Removes ninja mask, fixes ninja internals, fixes non-ninja voice changer
 2014-12-15 08:53:05 +01:00
GinjaNinja32
f6b5edc130 Fixes error in rig voice-changer message 2014-12-15 05:39:00 +00:00
GinjaNinja32
1eddd1fea9 Span classes 2014-12-15 05:36:35 +00:00
Hubblenaut
5fe9ca3df1 Species use a list for unarmed attack types 2014-12-14 22:48:14 +01:00
Amunak
6c1911c34e Makes 'other' PM colour way darker. 2014-12-14 17:03:54 +01:00
Amunak
1fb9c76101 Makes admin log messages bold again. 2014-12-14 16:51:59 +01:00
Amunak
b710e70046 Makes asay purple again. 2014-12-14 16:51:33 +01:00
Amunak
e348e8e031 Reverts admin log colour. 2014-12-14 16:46:47 +01:00
PsiOmegaDelta
213d042f58 Merge pull request #7460 from mwerezak/stance 
Fixes #7406
 2014-12-14 10:08:41 +01:00
GinjaNinja32
16a7e2a4b9 Removes ninja mask, fixes ninja internals 2014-12-14 07:02:28 +00:00
Amunak
b2c266ff93 More research console GUI formatting. 
Also simplified the <LI>st definitions.
 2014-12-14 05:18:43 +01:00
Amunak
6bf59253fd Fixes wrong shield design path 2014-12-14 05:16:49 +01:00
Zuhayr
29a3d34ff0 Fixes (at least some) of the recursive power-drain crash issues. 2014-12-14 14:44:53 +10:30
Amunak
b84cc64027 Removes duplicate shield research definitions. 
They were moved to the common designs file by a previous commit.
 2014-12-14 05:05:55 +01:00
Amunak
b7e7d08599 Fixes destructive analyzer name. Removed oldcode. 2014-12-14 05:05:09 +01:00
Amunak
67c719d9d6 Updated medical records console description. 2014-12-14 05:03:15 +01:00
Amunak
158573f066 Corrects names of computers, code formatting, updated computer descriptions. 
Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
 2014-12-14 05:00:38 +01:00
Amunak
429a898e72 Fixes a bug that made bubble shield gen unconstructable 2014-12-14 04:56:23 +01:00
Zuhayr
920ede6767 Merge pull request #7458 from mwerezak/chem-colours 
Fixes colour mix up
 2014-12-14 13:09:12 +10:30
Zuhayr
70abe4af0d Merge pull request #7447 from mwerezak/manual-runtime 
Alternative fix for manual runtimes
 2014-12-14 13:06:16 +10:30
mwerezak
1546d9f293 Fixes #7406 2014-12-13 19:56:11 -05:00
mwerezak
e01d056b75 Fixes #6240 2014-12-13 19:50:28 -05:00
mwerezak
bef305dff1 Fixes handle_organs() being called twice in Life() 2014-12-13 19:50:12 -05:00
PsiOmega
efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
mwerezak
c554f70d88 Fixes colour mix up 
Somehow phoron got the colour meant for inaprovaline.
 2014-12-13 17:54:30 -05:00
SparklySheep
dfbe05ff8b Fixes a typo in the Hydroponics reagents 2014-12-13 14:59:56 -06:00
mwerezak
168cabf03a Fixes manual runtimes without modifying the construction of every object 
Loads configuration before map creation instead.

This reverts commit 37b14bae39.
 2014-12-13 09:35:36 -05:00
Chinsky
9536a92d60 Merge pull request #7442 from PsiOmegaDelta/CultGhost 
Cult Ghost Manifestation
 2014-12-13 17:06:10 +03:00
PsiOmegaDelta
0bba4e6f68 Merge pull request #7441 from sabiram/dev-freeze 
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
 2014-12-13 14:59:41 +01:00
Zuhayr
94d0fb99e2 Merge pull request #7439 from PsiOmegaDelta/RoundEndCut 
Removes complete player round end listing.
 2014-12-14 00:26:25 +10:30
Chinsky
4b9d185495 Merge pull request #7445 from Zuhayr/dev-freeze 
Dev-freeze fixes.
 2014-12-13 16:55:17 +03:00
Zuhayr
4c1f070f1b Merge pull request #7440 from Amunak/patch-1 
Bringing back Secret.
 2014-12-14 00:23:51 +10:30
Zuhayr
a79886ec59 Added icons to species select window, changed Sol Common to blue. 2014-12-13 23:55:06 +10:30
Zuhayr
fbd4e46a3c Added syllable sets for remaining languages. 2014-12-13 23:16:17 +10:30
Zuhayr
a704d1bf94 Merge branch 'languages' of https://github.com/Zuhayr/Baystation12 into dev 2014-12-13 23:13:40 +10:30
Zuhayr
0c9d9999b3 Removed now-redundant buckle check. 2014-12-13 23:11:59 +10:30
Zuhayr
d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2 Fixes #7290 2014-12-13 23:04:13 +10:30
Zuhayr
c569d52700 Fixes pretzels being unmakable (use a poppy instead of the seeds) 2014-12-13 22:46:55 +10:30
Zuhayr
e3b5c35822 Fixes simple_animal nuzzling. 2014-12-13 22:46:33 +10:30
Zuhayr
02fefbff54 Fixes #7345 2014-12-13 22:37:22 +10:30
Zuhayr
0ce52b086a Fixes #7371 2014-12-13 22:32:35 +10:30
Zuhayr
7770b355dd Fixes #7404 2014-12-13 22:15:13 +10:30
Zuhayr
2569fdc1c2 Fixes #7437 2014-12-13 21:58:06 +10:30
Zuhayr
473f78a562 Fixes #7408 2014-12-13 21:58:00 +10:30
Zuhayr
9b51078fdf Fixes #7410 2014-12-13 21:57:51 +10:30