cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,640 Commits 5 Branches 0 Tags
cf15517f8a75b431af24ae6622de10aa0fc86ee8
Commit Graph

16215 Commits

Author SHA1 Message Date
Mloc-Argent
cf15517f8a fix up airless turfs to be actually airless 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-21 20:36:11 +00:00
Mloc-Argent
debba68c44 add sleeping for ZAS connection edges 
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-21 20:35:40 +00:00
Zuhayr
fc203f186a Merge pull request #7478 from GinjaNinja32/cameras 
Converts camera console to NanoUI
 2014-12-17 19:43:55 +10:30
Ccomp5950
8d65f8a87a Merge pull request #7175 from atlantiscze/pewPEWPEWboom 
[Ready To Merge] Emitter update

or how I might learn to love the revert button.
 2014-12-16 21:17:54 -05:00
Ccomp5950
20e6b4ca01 Merge pull request #7395 from atlantiscze/nanostuff 
NanoUIs
 2014-12-16 21:11:55 -05:00
Wild Bill
5bae906c47 Reserve PascalCase inits 2014-12-16 16:20:50 +02:00
GinjaNinja32
a7bcd6f406 NanoUI camera console 2014-12-16 12:30:25 +00: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
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
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
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
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
eafaef5cfa Merge pull request #7422 from PsiOmegaDelta/MovableCorpses 
Makes remains movable/cleanable.
 2014-12-13 19:40:44 +10:30
Zuhayr
b4e3b78392 Merge pull request #7418 from PsiOmegaDelta/Cryo 
Crypods now displays the name of occupant.
 2014-12-13 19:40:15 +10:30
Zuhayr
4a14e25026 Merge pull request #7426 from PsiOmegaDelta/NoIconLabCoat 
Fixes labcoat without icon.
 2014-12-13 19:39:23 +10:30