cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,725 Commits 5 Branches 0 Tags
40e8d9b792dfd574dfbbdd2ad9fc437ac45217b0
Commit Graph

5404 Commits

Author SHA1 Message Date
Chinsky
40e8d9b792 Fixes radium not producing cures for virus2. 2013-06-02 23:58:29 +04:00
Mloc
dd0e13c8fd Compile fix. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-06-01 21:11:41 +01:00
cib
af8e3a9192 Fixed the issue of missing when hitting yourself. 2013-06-01 18:11:24 +02:00
Chinsky
b91cf84993 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-01 04:18:43 +04:00
Chinsky
793f472a4f Should fix quite a few of false positives on gun targeting. 
Allows mob to click on turfs with empty hand.
 2013-06-01 04:11:16 +04:00
Chinsky
1a51aefaac Fixes #2922 
Putting gun away now properly lowers aim.
Prevents gun from going off if it's not in active hand.
 2013-06-01 04:05:33 +04:00
Segrain
312ece670d Meteor shower fix. 
Meteor shower actually processes tick() between starting and ending, thus spawning meteors as it is supposed to.
 2013-05-30 19:26:53 +03:00
MagmaRam
db07fd16fd Fixes an issue where an uzi could not be reloaded, they can now be reloaded with boxes of .45 bullets. 2013-05-30 18:54:31 +07:00
Andrew Carroll
97836acb56 Add station time to AI, new_player Status tab 2013-05-30 04:38:18 -04:00
Mloc
4eb113341d Merge pull request #2871 from ciiol/bs-rtag 
Fix radio keys localization.
 2013-05-29 14:26:03 -07:00
MagmaRam
e4c913fad9 Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click). 2013-05-29 13:34:54 +07:00
Chinsky
40e63cbe32 Merge pull request #2885 from Ravensdale/master 
Cyborg sprites
 2013-05-28 22:17:13 -07:00
Erthilo
01ef589293 Fixes everyone being able to understand everyone else. 2013-05-28 23:53:49 +01:00
Ravensdale
62e43f2abf re-adding an accidentally deleted line 2013-05-28 12:07:22 -07:00
Jim "Apples"
b80ae68cc5 Merge pull request #2883 from CIB/master 
Re-buff even timer
 2013-05-28 11:49:25 -07:00
Ravensdale
b42aa26c1a Gives more sprites for cyborgs to use. 2013-05-28 11:13:33 -07:00
cib
a9d4d86ed9 Event balance fixes. 
- Engineering events now less likely
- Radiation storm now less likely
- Halved radiation given by radiation storm.
 2013-05-28 20:03:26 +02:00
Chinsky
d2179f4252 Merge pull request #2875 from CIB/medical_events 
Fixed issue #2689
 2013-05-27 12:04:19 -07:00
cib
c5dc8ebecf Triped time you have to get into maintenance. 
Also re-added sound at start of event. It doesn't fit, but it's better than nothing. Quit complaining already.
 2013-05-27 20:01:37 +02:00
Ciiol
e7127b8343 Fix radio keys localization. 
Add cyrillic analogs of xeno language keys, just as other channel prefixes.
 2013-05-27 16:34:39 +06:00
Mloc
b4743bef26 Merge pull request #2865 from CIB/medical_events 
Fixed various medical events.
 2013-05-26 14:56:53 -07:00
cib
cbbe291a5d Fixed various medical events. 2013-05-26 23:21:08 +02:00
cib
dbe960a571 Buffed event delay a bit again. 2013-05-26 22:16:11 +02:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master 
Fix to event no-repetition code
 2013-05-26 11:40:42 -07:00
Chinsky
76525a4ccf Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze 
Changeling husk names now 'Unknown'
 2013-05-25 16:03:24 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
cib
9074622eb9 Adjusted event chance modifier based on last event. 
Had the wrong numbers, basically every event would happen only once.
 2013-05-26 00:23:31 +02:00
cib
a764c226f8 Implemented a system to avoid the same event happening too often. 
Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.
 2013-05-26 00:12:59 +02:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
Chinsky
e197799c46 Fixes #2830 
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
 2013-05-25 13:34:24 +04:00
Jim "Apples"
858d98eb7c Merge pull request #2816 from comma/HTML 
HTML in papers
 2013-05-24 14:30:36 -07:00
cib
89aa936147 Fix to organ_failure event. 2013-05-23 22:46:27 +02:00
cib
b1b448e0ee Adjusted event announcement delays. 
Also improved some radiation belt announcements.
 2013-05-23 20:15:45 +02:00
cib
aa6bfc33c7 Airlock and APC changes. 
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
 2013-05-23 16:43:29 +02:00
Chinsky
629022f7b0 Fixes #2836 
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
 2013-05-23 15:06:37 +04:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master 
No tears, only dreams
 2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-22 13:36:27 -07:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-05-22 16:51:41 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such. 
That lead to knives bruising people you stab, for example.
 2013-05-22 12:55:15 +04:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master 
Readded Pockets in the Responder Jackets
 2013-05-20 14:34:15 -07:00
Roaper
99ff1f7ee0 Added Pockets to First Responder Jacket 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-20 13:33:44 -07:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch 
Xenoarch tweaks
 2013-05-19 04:24:15 -07:00
Cael_Aislinn
1784bcbb04 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:41:18 +10:00
Cael_Aislinn
454d67d899 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:34:10 +10:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:12:42 +10:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 18:50:15 +10:00