cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,537 Commits 10 Branches 0 Tags
16b2c9cab85d30a69ad0fcab3c9f14bb654ed77c
Commit Graph

17720 Commits

Author SHA1 Message Date
Zuhayr
16b2c9cab8 Fixes a minor thing with vox. 2015-03-26 15:54:29 +10:30
Zuhayr
87f37dbb43 Moves damage masks and damage overlays to species level. 2015-03-26 15:45:47 +10:30
Zuhayr
efa6f0d3c9 Finalized monkey species definitions and icons. 2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30
Zuhayr
8af1a818e9 Merge branch 'monkeys' of https://github.com/Zuhayr/Baystation12 into monkeys 2015-03-26 12:18:14 +10:30
GinjaNinja32
61a8b8e14c Fixes #8450 2015-03-25 02:17:02 +00:00
Chinsky
870bbd7084 Merge pull request #8599 from PsiOmegaDelta/OperatingDoor 
Door logic gathering.
 2015-03-25 01:16:34 +03:00
Chinsky
959ee07119 Merge pull request #8607 from Kelenius/ofDrillsAndMiners 
Updates drill and scanner
 2015-03-24 20:05:25 +03:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Kelenius
78bac425ad Updates drill and scanner 2015-03-24 18:34:26 +03:00
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze 
Dev freeze
 2015-03-24 14:00:57 +01:00
PsiOmega
2b198a6d29 Door logic gathering. 
Gathers the checks for if an airlock can be closed into the can_close() proc.
 2015-03-24 07:22:39 +01:00
Zuhayr
7e615521ef Should fix issues with invisible seeds/products/plants. 2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c Hackfix for #8588 2015-03-24 12:46:07 +10:30
Zuhayr
a57ba2e26b Fixes #8589 2015-03-24 12:39:55 +10:30
GinjaNinja32
89bbfbcfad Fixes depowered doors not being able to be closed 2015-03-23 23:25:58 +00:00
PsiOmega
bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786 Merge pull request #8592 from comma/maxlen 
Readded missing check for paper editing
 2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64 Readded missing check for paper editing 
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
 2015-03-23 23:02:43 +03:00
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass 
Fixed construction borg's Rglass
 2015-03-23 21:34:36 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
Zuhayr
a454e77444 Merge pull request #8573 from PsiOmegaDelta/StrayCharacter 
Fixes stray character.
 2015-03-23 10:55:08 +10:30
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel 
Deletes AI eye along with the AI.
 2015-03-23 10:54:36 +10:30
Chinsky
f4dd077d50 Merge pull request #8571 from PsiOmegaDelta/EyeFix 
Fixes #8534.
 2015-03-22 21:47:17 +03:00
Chinsky
f72d5e10ef Merge pull request #8570 from PsiOmegaDelta/AIForcedShutters 
Emergency shutters opened by silicons no longer autoclose.
 2015-03-22 21:47:12 +03:00
PsiOmega
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
9286f10a35 Fixes stray character. 2015-03-22 18:45:03 +01:00
PsiOmega
f9b8c2dbc9 Fixes #8534. 
Sets icontype to its proper value.
 2015-03-22 16:25:24 +01:00
PsiOmega
8562195f05 Emergency shutters opened by silicons no longer autoclose. 2015-03-22 14:57:12 +01:00
Zuhayr
8791c2bf1e Fixing a typo. 
! and ~ both compile. Feh.
 2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
GinjaNinja32
26d878fb02 Move closing bracket outside <i> tag 
Opening bracket is outside. Consistency!
 2015-03-21 21:08:54 +00:00
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
d8018db5c9 Finally got things working from vote to roundstart to join to death. 2015-03-21 11:14:59 +10:30
Zuhayr
fe6cd5af13 Dropped antagonist folder down a directory level. 2015-03-21 11:14:48 +10:30
Zuhayr
4d14722b2a Split antagonist.dm up. 2015-03-21 11:14:47 +10:30
Zuhayr
3718245e45 Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation. 2015-03-21 11:13:53 +10:30
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +10:30
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
Zuhayr
4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr
d79af13a2c Resolving bugs with the game mode refactor. 2015-03-21 11:08:21 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Zuhayr
cd0bf9622d Merge pull request #8557 from Baystation12/dev-freeze 
Dev freeze
 2015-03-21 11:03:58 +10:30
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
Chinsky
5fae54e4a8 Merge pull request #8554 from Zuhayr/dev-freeze 
Fixes #8543
 2015-03-20 17:04:23 +03:00
Zuhayr
87fe7d80f0 Merge pull request #8542 from PsiOmegaDelta/IWasFrozenToday 
Cryopod naming fixes.
 2015-03-20 21:00:07 +10:30