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
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

1602 Commits

Author SHA1 Message Date
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
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
63ea6eba0d Adds docking controllers to shuttles 
Shuttles dock at round start.
 2014-06-09 23:37:37 -04:00
Zuhayr
dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
Jeremy Liberman
bc1628378d Rephrase text based on code review 2014-06-03 21:51:21 -05:00
Jeremy Liberman
2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
Zuhayr
7a56a174dc Converted Syndicate shuttle over to multi-shuttle setup. 2014-06-04 00:08:10 +09:30
Zuhayr
54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Chinsky
a086043a9b Merge pull request #5116 from mwerezak/round-end 
Round no longer ends suddenly
 2014-06-02 23:00:48 +04:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
mwerezak
e91f285ce9 Adds cleanup for heist mode 2014-06-01 17:01:35 -04:00
mwerezak
cc4a6e0f26 Fixes config.continous_rounds and adds check 2014-06-01 15:49:13 -04:00
mwerezak
dbe43db59a Round no longer ends suddenly 
Instead, a crew transfer vote is called. Also adds cleanup proc to
game_mode.
 2014-06-01 14:50:57 -04:00
Hubblenaut
eb23c44c8a Removes explosive implants from nuke ops 2014-06-01 20:15:39 +02:00
Zuhayr
825a77b702 Fixes end of round drone spam. 2014-05-31 15:38:10 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Chinsky
4594e2bf1b Merge pull request #5071 from Ravensdale/dev 
Updates most used viable entries of Tau Ceti to Nyx
 2014-05-27 21:46:43 +04:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
Zuhayr
4538fbabca Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits. 2014-05-27 01:18:07 +09:30
Jeremy Liberman
aefb1cbc05 Secret Mutiny Mode backstory easter egg 2014-05-26 01:00:33 -05:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Jeremy Liberman
c607872b80 Mutiny fix prereqs for directives 2014-05-25 14:20:37 -05:00
Hubblenaut
e28ce8a366 Removed all prefixes of type 'paper - ' 2014-05-23 22:31:27 +02:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Jeremy Liberman
5f025b630a Mutiny fixes; add sanity checks, prevent recruitment spam, fix pinpointer description, fix overlays when changing teams, and convert indents to tabs 2014-05-18 11:05:04 -05:00
Loganbacca
7d75f6432d Fixed doubled construct spells 
Constructs were being assigned duplicated spell lists when spawned from soulstones
 2014-05-18 19:52:03 +12:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
 2014-05-13 20:45:05 -04:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
c44e7b0e56 Fixes #4495. 2014-05-05 16:14:59 +09:30
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
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07: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
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
5ca99dabe7 Adds an additional \ 2014-04-09 14:06:52 +03:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
SparklySheep
341f8570e4 Changeling Rebalances 
As discussed here: http://www.baystation12.net/forums/viewtopic.php?f=5&t=10001
 2014-04-07 14:34:27 -05:00
Ccomp5950
5933496ad0 Merge pull request #4696 from Jarcolr/epsilon 
Removes unfat sting from changeling evolution menu
 2014-04-06 00:16:42 -05:00
Jarcolr
925cb02ef7 Removes useless unfat sting from evolution menu 
Also fixed a typo; but meh.

No point in having to use points on something that has no use.
 2014-04-05 10:20:54 +03:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Graham Lloyd
eae613d928 Fixes malf picking players to me malf who don't have BE_MALF toggled on. 2014-03-31 15:39:49 -04:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master" 
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
 2014-03-24 13:55:41 +00:00
iamgoofball
6fa4084d11 Adds 9 new Chameleon items. 
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
 2014-03-23 14:08:23 -07:00