cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 9 Branches 0 Tags
fe0e1ecfb65efbdd1069affe77a73c048a39f02c
Commit Graph

13651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mloc
857fe33388 Merge pull request #3258 from Zuhayr/feature 
Commenting out ninja mode, as it is broken.
 2013-07-06 04:53:08 -07:00
Zuhayr
9dec8e311c Merge pull request #3252 from Segrain/bleeding-edge-freeze 
Examining cyborgs.
 2013-07-06 00:30:09 -07:00
Zuhayr
bbeca8280e Merge pull request #3253 from Spamcat/signs 
Signs
 2013-07-06 00:28:07 -07:00
Spamcat
5f690e150d Part 3: fixing shit 2013-07-06 02:53:06 +04:00
Spamcat
63de302a09 Part 2: construction. 2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c Stage 1: deconstruction. 2013-07-06 02:53:01 +04:00
Spamcat
87feed7e7b Nice colours (and a minor bugfix) 2013-07-06 02:53:00 +04:00
LordBraindead
6f0ebc1bb5 changed how fire works 
-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
 2013-07-05 19:56:53 +01:00
LordBraindead
7345b059a3 changed variable settings for the change in fire.dm 
added one new variable
deleted three variables that are no longer used
 2013-07-05 19:56:45 +01:00
Segrain
a2d3edcaff More fixes. 2013-07-05 21:56:25 +03:00
LordBraindead
ff912e132b readjusted composition of syndie bombs 
set them to produce a 1-2-5 explosion for the fire changes
 2013-07-05 19:55:28 +01:00
Mloc-Argent
f346d72383 Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 
Conflicts:
	config/config.txt
 2013-07-05 19:55:01 +01:00
Zuhayr
5f980c967b Merge pull request #3246 from LordBraindead/bleeding-edge-freeze 
rewrite of fire code - second attempt
 2013-07-05 10:14:46 -07:00
Segrain
5abed5a5f6 Modtype tweak. 2013-07-05 20:10:39 +03:00
Zuhayr
ec92507260 Merge pull request #3251 from Ravensdale/master 
Custom sprite quickfix
 2013-07-05 07:03:13 -07:00
Ravensdale
d514be535c Remove mordeth221 from custom sprites list until his sprites are ready and in. 2013-07-05 06:54:17 -07:00
Mloc
fc2ab59db7 Merge pull request #3250 from Zuhayr/feature 
Fixes
 2013-07-05 06:41:07 -07:00
Zuhayr
349851313e Typo. 2013-07-05 23:34:44 -07:00
Zuhayr
aeec95b350 Robot immortality fixes. 2013-07-05 23:31:27 -07:00
Zuhayr
8f596f5fc1 Air alarm runtime fix. 2013-07-05 22:32:37 -07:00
Zuhayr
0cfaf8e70b Minor string fix. 2013-07-05 22:15:40 -07:00
Zuhayr
60b9d0f8fc Compile fix. 2013-07-05 22:09:27 -07:00
Zuhayr
a2249fb1dc Fixes yank out verb string issues. 2013-07-05 22:01:09 -07:00
Zuhayr
b6699cbf9a Adds ammo to vox spawning with a crossbow. 2013-07-05 21:57:51 -07:00
Zuhayr
5dc40474ec Removes vox randomness in appearance. 2013-07-05 21:53:17 -07:00
Zuhayr
ea49fcf2a9 Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12 2013-07-05 21:47:09 -07:00
Zuhayr
d04514e9ad Partial fix for #3087 2013-07-05 17:04:08 -07:00
Zuhayr
151449447a Merge pull request #3249 from CIB/bleeding-edge-freeze 
Fixed two bugs with robot components.
 2013-07-05 04:43:25 -07:00
cib
f10c08253f Fixed two bugs with robot components. 
1. They could be broken but still powered.
2. Melee damage didn't work at all.
 2013-07-05 13:43:11 +02:00
LordBraindead
ba15e0f515 readjusted composition of syndie bombs 
set them to produce a 1-2-5 explosion for the fire changes
 2013-07-05 09:06:34 +02:00
LordBraindead
032530dfd7 changed variable settings for the change in fire.dm 
added one new variable
deleted three variables that are no longer used
 2013-07-05 09:04:39 +02:00
LordBraindead
9cc31cdd21 changed how fire works 
-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
 2013-07-05 09:03:32 +02:00
Zuhayr
a1be7e431c Merge pull request #3245 from Zuhayr/feature 
SkyMarshal's ZAS fixes from bef.
 2013-07-04 23:14:04 -07:00
Zuhayr
dba4eb5eb2 Merge branch 'airfixes' of https://www.github.com/SkyMarshal/Baystation12 2013-07-05 16:14:38 -07:00
Zuhayr
9ceb886d0c Fixes #2905 2013-07-04 23:48:59 -07:00
Zuhayr
15de508b49 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-04 23:29:48 -07:00
Zuhayr
a8ea0a3fd4 Bot shield not working against melee fix. 2013-07-04 23:23:22 -07:00
Zuhayr
1e7dc9667e Vox raider class distribution fix. 2013-07-04 23:22:55 -07:00
Zuhayr
1750f1e631 Merge pull request #3244 from Ispil/Staging 
Fixes issue #3240. The order for visible_message is visible, person, aud...
 2013-07-04 23:09:44 -07:00
Zuhayr
41784223e2 Merge pull request #3243 from SkyMarshal/airfixes 
Fixes some ZAS issues and improves air alarms some.
 2013-07-04 23:09:17 -07:00
Zuhayr
19b5f2219d Merge pull request #3241 from Spamcat/pulse 
Pulse
 2013-07-04 23:08:11 -07:00
Ispil
255408c026 Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed. 2013-07-04 21:13:33 -07:00
SkyMarshal
efd3d83e78 Reverts my firechanges, also air alarms now have a temperature regulation capacity. 2013-07-04 20:55:59 -07:00
Zuhayr
dc3485ab2d Indenting issue. 2013-07-04 20:37:10 -07:00
Zuhayr
0852a9f4b1 Partial fix for #3236 2013-07-04 20:34:37 -07:00
Zuhayr
2c6e0e2bcc Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 20:32:24 -07:00
Zuhayr
0140738157 Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12 2013-07-04 20:26:55 -07:00
SkyMarshal
87f576fb64 ZAS and alarm fixes. 2013-07-04 20:22:19 -07:00
Spamcat
f7dc8f8c0a derp 2013-07-05 04:50:18 +04:00
Spamcat
1541b5dec8 Changelog. 2013-07-05 04:44:54 +04:00