Commit Graph

16136 Commits

Author SHA1 Message Date
Hubblenaut
7988b78f69 No stomping when grabbing 2014-12-23 14:46:59 +01:00
Hubblenaut
d2a31eb024 Changes on kicks and stomps 2014-12-23 14:46:58 +01:00
Hubblenaut
4065dcb7e2 Fixes, fixes, and more fixes 2014-12-16 14:51:46 +01:00
Hubblenaut
8120a9b77f Makes kicks and stomps their own unarmed_attack types 2014-12-15 18:54:07 +01: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
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
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
0c9d9999b3 Removed now-redundant buckle check. 2014-12-13 23:11:59 +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
Zuhayr
75d163705a Merge pull request #7419 from PsiOmegaDelta/Books
Fixes manual runtimes, ensures initialize is called even after round start
2014-12-13 21:50:35 +10:30
Zuhayr
8c3d179e78 Merge pull request #7434 from PsiOmegaDelta/World
Removes world messages.
2014-12-13 19:42:28 +10:30
Zuhayr
d6f13e98f7 Merge pull request #7425 from PsiOmegaDelta/PortaDupeFix
Prevents portable turret duplication.
2014-12-13 19:42:13 +10:30
Zuhayr
36f78ae38e Merge pull request #7430 from PsiOmegaDelta/Accounting
Fixes #7427.
2014-12-13 19:42:01 +10:30
Zuhayr
4a14e25026 Merge pull request #7426 from PsiOmegaDelta/NoIconLabCoat
Fixes labcoat without icon.
2014-12-13 19:39:23 +10:30
PsiOmegaDelta
009314a448 Merge pull request #7438 from mwerezak/chem-colours
Replaces dummy reagent colours
2014-12-13 09:17:37 +01:00
PsiOmegaDelta
2d15bb1312 Merge pull request #7435 from mwerezak/esword
Adds NOBLOODY to holoswords
2014-12-13 09:17:08 +01:00
Amunak
7de862cfe1 Fixed non-gamemode votes being unusable
Hopefully this doesn't break something else.
2014-12-13 07:21:09 +01:00
Zuhayr
cd096fd45b Merge pull request #7385 from Zuhayr/dev-freeze
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
PsiOmega
9c6adfe590 Cult Ghost Manifestation
Turns out ghosts could be pulled into reality in two places.
This ensures both use the same method.
2014-12-13 00:13:55 +01:00
mwerezak
6aa2c09fcf Replaces dummy reagent colours 2014-12-12 16:06:16 -05:00
sabiram
953f365292 Adds 'me' hotkey again. Pedantic spelling changes. 2014-12-12 15:44:22 -05:00
Amunak
7411d1c38a Bringing back Secret.
Hopefully this fixes my previous fix that managed to remove Secret from vote options, because it's not an actual gamemode.
2014-12-12 21:36:59 +01:00
PsiOmega
0aa1a39083 Removes complete player round end listing.
Was nice but still too much, even with the 'lite' return text.
Sadly cannot make it a client preference either, we've apparently reached our limit.
2014-12-12 21:31:04 +01:00
PsiOmega
37b14bae39 Fixes manual runtimes, ensures initialize is called even after round start. 2014-12-12 20:07:53 +01:00
mwerezak
02368b84f4 Adds NOBLOODY to holoswords. 2014-12-12 13:51:08 -05:00
PsiOmega
3eef1796d2 Removes world messages. 2014-12-12 19:49:30 +01:00
Zuhayr
45edc7e4bc Merge pull request #7412 from Amunak/patch-3
Fixes mercenary mode showing up as nuclear in vote
2014-12-13 05:17:34 +10:30
Zuhayr
a0192f47df Merge pull request #7401 from PsiOmegaDelta/YouHaveViolatedTheLaw
Fixes Officer Beepsky wrecking targets he cannot see.
2014-12-13 05:16:45 +10:30