cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,471 Commits 5 Branches 0 Tags
8d9d83d5ef07d3d793417459b27ebb51b3a3fef2
Commit Graph

15274 Commits

Author SHA1 Message Date
Mloc
58953a3d31 fixes #6499 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 17:48:21 +01:00
Mloc
dbff924849 fixes #6562 
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 17:48:17 +01:00
Zuhayr
3fd8b64f86 Added new diona icons, added heat to alien life(), added fire indicator. 2014-10-01 22:21:34 +09:30
Akai Alonkai
4c5665d4fd Add round start check to Declare Ready 
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
 2014-10-01 06:16:29 -04:00
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan 
small fixes 2
 2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e Merge pull request #6563 from mwerezak/cargo 
Fixes supply shuttle state when returning
 2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0 Merge pull request #6560 from Mloc/bs12-efab 
small fixes
 2014-10-01 18:52:59 +09:30
Mloc
ee4eafa660 fixes #6090 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 10:17:55 +01:00
Mloc
d43dbaa7b5 resolves #6260 
chance was being checked twice, for some reason.

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 10:13:15 +01:00
Zuhayr
cc21a1b405 Muzzle check/changeling check removal, thanks Harpy. 2014-10-01 18:32:24 +09:30
Mloc
39781326cc fix for artifact teleportation effect 
will no longer teleport you inside random objects.

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 09:54:39 +01:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Mloc
bb2953b283 re-port trange() from tg 
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 08:50:28 +01:00
Chinsky
a26185dd9e Merge pull request #6553 from atlantiscze/android-roundstart-fix 
Android roundstart fix
 2014-10-01 10:01:39 +04:00
Chinsky
165bbadc10 Merge pull request #6551 from RavingManiac/dev 
Space floating effect
 2014-10-01 10:01:25 +04:00
Chinsky
701e97960a Merge pull request #6554 from PsiOmegaDelta/RoundEnd 
Round-end summary now also lists job
 2014-10-01 10:01:07 +04:00
mwerezak
d81670edfb Fixes supply shuttle state when returning 
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
 2014-10-01 00:48:16 -04:00
Mloc
f9fa7efe6e fixes #6550 
computer circuits now use paths instead of strings

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 23:48:54 +01:00
PsiOmega
f95d6f36b9 Manifest ghosts are now given an assigned role to go with the round end summary. 2014-10-01 00:22:13 +02:00
Mloc
61394d3921 fixes #6561 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 22:18:25 +01:00
Zuhayr
d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
Mloc-Argent
3a0289d4ec fixes #6329 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:02 +01:00
Mloc-Argent
1bc57f43f6 optimize secbots a tiny bit 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:01 +01:00
Mloc-Argent
6fb1667b44 fixes #4742 
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:00 +01:00
Mloc-Argent
4160488ed1 fix gas overlays persisting after rebuilds 
slight visual artifact when zones are rebuilt, overlays will be
missing until the end of the current tick.  otherwise works fine.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:51:59 +01:00
Mloc-Argent
43546fe9f0 fix stretched lighting 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:51:58 +01:00
Mloc
7a0b0c4369 fixes #6115 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:39:11 +01:00
Mloc
277335f487 fixes #6541 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:13:41 +01:00
Mloc
6a91020529 fixes #6540 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:13:03 +01:00
Mloc
8c2c16cd1e fix #6555 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 19:25:37 +01:00
RavingManiac
66527ab763 gravitychange() now makes all affected mobs have the floating animation unless magbooted, etc. 
New mob proc Check_Dense_Object() seperated from Process_Spacemove(), checks for adjacent objects or turfs that can be pushed off, also handles magboots on gravity-less floors.
 2014-09-30 23:18:04 +08:00
RavingManiac
c4875e7d36 Floating effect now uses animate() instead of pixel_y while loop thingy. 
Distinct actions that indefinitely change a mob's pixel_y or pixel_x, like strapping someone to a roller bed, should also alter new variables old_y or old_x accordingly. This means that floating and jittering animations no longer interfere, as the animations use old_x/old_y as the "base" position.

Entering areas with gravity from areas without grabity now removes floating effect.
 2014-09-30 22:37:48 +08:00
Ikmachek
a9e4f6f233 Merge branch 'master' of https://github.com/Ikmachek/Baystation12 2014-09-30 10:36:01 -04:00
Zuhayr
b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
Ikmachek
adc147bcc0 Reduced vote alert noise by half, now easily editable by an arg 2014-09-30 09:28:51 -04:00
Mloc
484082230c fixes #6549 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 11:35:20 +01:00
Chinsky
db19505e10 Merge pull request #6544 from Jarcolr/customis 
Adds *5* approved custom items to code
 2014-09-30 12:21:04 +04:00
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
Atlantiscze
ff9f79acfc Cleaner version of previous commit. 2014-09-30 09:15:21 +02:00
Atlantiscze
8d58fc2e97 Android Roundstart NameFix 
- Positronic Brains in Androids now have proper posibrain-like name, instead of using MMI-like name.
- Example: (Tes Ter -> SINA-123)
 2014-09-30 08:56:28 +02:00
Zuhayr
bab862f24c Readded transform procs for xenos. 2014-09-30 16:07:47 +09:30
Zuhayr
e2ce1fa2df Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens. 2014-09-30 15:28:30 +09:30
Zuhayr
b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr
f44a53fb69 Removed a debug. 2014-09-30 13:28:56 +09:30
Zuhayr
63629a953b Added Add and Remove Organ options to VV. 2014-09-30 13:23:28 +09:30
Zuhayr
70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Zuhayr
a0d23b3800 Reimplements ninja and cult species rarity bonuses. 2014-09-30 12:17:33 +09:30
Zuhayr
161d21f8d0 Added cuff-breaking checks for can_shred(). 2014-09-30 12:03:19 +09:30
Zuhayr
74eae5a6bd Moved radiation and light processing to organs. 2014-09-30 11:58:40 +09:30
Zuhayr
c0c4b99b34 Some prep work/support work for the alien resting icons. 2014-09-30 10:48:45 +09:30