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
15,523 Commits 5 Branches 0 Tags
bb9a37be8c84a9143527f7b75f8cf700c92db910
Commit Graph

1076 Commits

Author SHA1 Message Date
Zuhayr
f54d75cd35 Fixes #4240 2014-01-09 12:44:17 +10:30
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
Ccomp5950
94f8ccfddd Bugfix: AI no longer dies if touching the supermatter, using attack_ai instead of a isAI() check. 2013-12-03 18:50:19 -06:00
Ccomp5950
254bba5e1a Bugfix: AI's will no longer disintegrate if they click the supermatter. 
While hilarious this is a terrible bug.
 2013-12-03 17:24:29 -06:00
volas
e33490d80a Fixes: AI won't steal fax, and mice won't flip tables anymore. 2013-11-30 23:54:06 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Ccomp5950
39ed2b7042 Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd) 
Also fixed a bug where if the supermatter is ordered off the supply shuttle it wouldn't produce power (process was deleted while in crate)

supplypacks.dm is just a spelling fix.
 2013-11-19 00:49:55 -06:00
Ccomp5950
fc4107e6ec TAB2SPACE of file. 
No changes in this commit besides standardizing indentions.
 2013-11-19 00:46:27 -06:00
jack-fractal
cf5012ce1d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-17 16:30:42 -05:00
Nanai
c977a40b3f Adjusted areas for medbay(Surgery, Patient rooms, genetics cloning, breakroom, psych office) so their APCs work. 
Adjusted areas for engineering storage to actually function.
 2013-11-17 16:19:13 -05:00
Nanai
808653ed12 Map Fixes IV: Areas Rising 
Removed the odd locker room area.

Properly edited dorm areas to individual areas UNDER the sleep area so as to properly reap the benefits of being a dorm.

Added a camera to security dorms.

SMES wiring adjustment.
 2013-11-17 15:50:55 -05:00
Nanai
7786e7a96c Sleeper Addition, Chemical Rebalance 2 
Tweaked soporific and new chems a bit more. Added Paracetamol, a lesser drug to tramadol, known to all as tylenol, and implemented it into sleepers! Gave inaprovaline the IB slowing property to keep sleepers in the game and allow EMTs better usage. Oxycodone made easier to craft by making the plasma a catalyst, but decreased it's overdose limit. Applied oxycodone and paracetamol to be able to handle things painkillers should.
 2013-11-14 19:11:31 -05:00
Mloc-Argent
e6b44d0f35 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-11-14 12:03:59 +00:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master 
Merge Dev with Master
 2013-11-07 16:31:43 -08:00
Chinsky
8b89b54233 Caches side effect types to a global list, less loops on addition. 
Makes them process only every 15 ticks, to cut down on the calls.
Removes damage because it was supposed to be gone, no idea why I didn't delete the lines.
 2013-11-08 03:18:25 +04:00
Chinsky
a90888b851 Missed last debug line 2013-11-08 02:10:20 +04:00
Chinsky
65c248cda0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma 2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Chinsky
9c6a51b3fb Commens out debuglog spam in side effects 2013-11-04 22:38:55 +04:00
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:10:17 +10:00
jack-fractal
6764c54989 making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits 2013-10-26 16:52:14 -04:00
Kilakk
1ed2ea6ec2 Fiddling with cooldown times 2013-10-26 13:35:31 -04:00
Kilakk
2aae632786 Added the ability to send faxes between departments 2013-10-26 13:21:56 -04:00
Nanai
c9d8fa15ab Del rework, as requested. 2013-10-24 18:25:36 -04:00
Nanai
c9dea9b89d New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu! 2013-10-24 15:47:26 -04:00
Segrain
14ee1bccbb Fix for #3770. 2013-10-13 23:04:46 +03:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
732596805a Merge pull request #3734 from Baystation12/master 
Master -> dev
 2013-10-06 11:39:36 -07:00
Chinsky
784b98d151 Side effects overhaul. 
Fixed cure message spam, now they do not remanifest while cure is still in system.

Changed yiming of side effects. They now start gatherping power only when their cause is no longer active. Around 180 ticks after that they start hurties.
This way they can be cured without either giving huge doses of cure (so they outlast the causing chem) or immediate remanifesting.
Because of way that loop works (and I am too lazy to think of other way, since ithis one is not that bad) you can only cure them when they are in active phase, so just adding cure to same pill won't do.

Also I axed out last damaging stages of side effects, since they are intended to be just an annoyance, not a disability.
 2013-10-06 11:59:47 +04:00
Mloc-Argent
4fa6316d39 Garbage collection for fire and explosive particles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-05 23:25:41 +01:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-20 13:35:49 +10:00
Segrain
9eee328d34 Verb categories. 2013-09-19 08:30:05 +03:00
Kilakk
9bd3f2997c Added in an awesome fax machine sprite by Cajoes 2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75 World loop removed successfully 2013-09-16 17:12:36 -04:00
Kilakk
6c4644664e Absolute paths for faxmachine procs 2013-09-16 17:09:36 -04:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
SkyMarshal
1f634873ea Merge pull request #20 from SkyMarshal/patch-3 
Fixes EFTPOS units failing to connect to account DB.
 2013-09-13 21:14:31 -07:00
SkyMarshal
7d81b02dbe Fixes EFTPOS units failing to connect to account DB. 2013-09-13 21:13:43 -07:00
SkyMarshal
7b1974e4b5 Prevents the accounts database from automatically being removed from machines. 2013-09-13 21:12:49 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00