cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,863 Commits 8 Branches 0 Tags
e17b8bffab68f4455c4ede6de9ce50b6449f77f4
Commit Graph

1116 Commits

Author SHA1 Message Date
Chinsky
9e8b124037 ixes #5075 
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
 2014-06-17 18:25:39 +04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02:00
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
42ed91feda Actually fixes #5100 2014-05-31 15:13:50 +09:30
Zuhayr
ed3a8ac44b Fixes #5100 2014-05-31 15:11:08 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Zuhayr
d9f728cff5 Fixes #5061 2014-05-28 16:57:15 +09:30
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
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