cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,246 Commits 8 Branches 0 Tags
52a9f0eb8e3ecc68f258be0220724254bfc68b83
Commit Graph

1101 Commits

Author SHA1 Message Date
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Loganbacca
c697b7a9b6 Null message fix 
Fixes the "User places  in the glass ashtray" messages having a null object name.
 2014-05-10 00:37:48 +12:00
Ravensdale
3b67dabb17 Atmos mainline pipe code moved and enabled. 2014-04-28 09:08:38 -07:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Cael Aislinn
976fb6520a misc tweaks and cleanups to shield gens/caps (renames, power usage), added a temp recharge delay when a field takes damage 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-04-23 08:48:21 +10:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Aryn
de86280434 Ctrl-H "faggot" to "meatball" and one icon state change. 2014-03-20 05:05:23 -06:00
Loganbacca
e26844df12 New areas for engineering remap 
- Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file
 2014-02-08 18:34:32 +13:00
Loganbacca
0ede7ed9cb Engineering area tweaks 
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
 2014-01-20 01:57:57 +13:00
Ccomp5950
171e63a66f Moved Supermatter.dm out of the WorkInProgress directory. 2014-01-15 17:33:13 -06:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Zuhayr
f54d75cd35 Fixes #4240 2014-01-09 12:44:17 +10:30
Aranclanos
96cf1b050d Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell. 
Conflicts:
	code/WorkInProgress/buildmode.dm
 2014-01-08 19:13:57 +00:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Zuhayr
2777761cef Merge pull request #4093 from comma/guestpass 
Guestpass
 2013-12-25 03:39:50 -08:00
Chinsky
4c4ee3eae5 Counting on machine controller to set uid was foolish of me. 2013-12-22 23:14:23 +04:00
Zuhayr
197d4993cf Merge pull request #4087 from comma/nostalgy 
Revisiting my first commits.
 2013-12-22 05:28:35 -08:00
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Chinsky
68b51d3188 Guest pass does not require to be processed anymore. 
Also agent IDs cannot copy access off them now (I think it would make them too powerful)
 2013-12-22 07:53:17 +04:00
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Chinsky
65fa11d496 Revisiting my first commits. 
Updated ashtray to actually accept cig butts and crush lit cigs properly.
Applied random transform to cig butts, and made fingerprints from original cig carry over.
 2013-12-18 12:02:20 +04:00
Chinsky
5754ba204f Adds guest passes. 
They act like IDs, but have limited duration (up to 30 minutes). When time is up, all access is erased from them.
Adds guest pass terminal, which issues these.
Anyone can issue them, but only to areas their ID has access to.
All issued passes are logged in terminals.
 2013-12-18 11:09:12 +04:00
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