cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

715 Commits

Author SHA1 Message Date
mwerezak
9e0562b16c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
 2014-06-23 22:00:57 -04:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Chinsky
86db41a582 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Merge branch 'master' of https://github.com/Baystation12/Baystation12

Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world.
 2014-06-22 14:30:50 +04:00
GinjaNinja32
8bb32e00fa Fixes ID computer's missing Security section 2014-06-16 21:32:58 +01:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +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
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02:00
Zuhayr
dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
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
Zuhayr
ba4293d5c4 Merge pull request #5125 from GinjaNinja32/crew-monitor 
Crew monitor
 2014-06-03 20:26:04 +09:30
Zuhayr
00c81bb675 Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 2014-06-03 15:26:34 +09:30
GinjaNinja32
a786f72e33 Fix NanoUI autoupdating 2014-06-02 09:59:38 +01:00
GinjaNinja32
42d8344f7d Change crew monitoring computer to use NanoUI 2014-06-02 09:29:34 +01:00
Zuhayr
ba9434366c Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering. 2014-06-02 15:54:40 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Chinsky
82b6e76d4c Merge pull request #5086 from UristMcKerman/spam-filter 
Spam filter
 2014-06-01 20:09:06 +04:00
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
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
UristMcKerman
e37a70089b Tweaks for spam #2 
Added brackets surrounding tokens to make whitespace and empty tokens
removable.
Slightly modified ion storm behavior.
Increased duration required to stop spam to 5 minutes.
Added ability to expand spam filter limit with installation of message
monitor circuits.
People will see why their message been discarded.
Discarded messages will be highlighted with red color in message log.
 2014-05-29 16:05:00 +04:00
UristMcKerman
c78605b1a4 Tweaks for spam 
Added non-randomized example tokens at start. Added filter limitation.
Ion storm will replace tokens with garbage. Spam disaster lasts longer
and is more severe.
 2014-05-29 00:31:02 +04:00
UristMcKerman
0a0ce28f68 Added spam filter 
Added spam filter functionality to message server and message server
monitor.
 2014-05-28 17:12:18 +04:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
Zuhayr
1d6501d6d3 Merge pull request #5067 from zekesulastin/langauges-again 
#3697 (clones have no languages) fixed again
 2014-05-26 23:17:52 +09:30
ZekeSulastin
bb3d947b64 Adds languages to DNA2 cloning records 2014-05-25 17:56:08 -04:00
Vivalas
a9d868a241 Update pod.dm 2014-05-25 14:59:25 -05:00
Vivalas
d8645a59e8 Pod Launch Fix 
Fixed a derpy code error.
 2014-05-24 19:56:35 -05:00
Hubblenaut
964e408b36 Line breaks in records\! 2014-05-23 17:58:07 +02:00
mwerezak
70333dfb51 Setting RD board access now uses visible_message 2014-05-22 18:19:34 -04:00
mwerezak
637f7193fc Fixes circuit var for other consoles 
Also cleans up attackby while we're at it.
 2014-05-22 18:05:57 -04:00
mwerezak
eb58fb1e0c Fixes RD console circuit var not set. 
Also removes redundant attackby code, and small change to text when
setting access protocol on the board.

Related to issue #5006
 2014-05-22 17:36:01 -04:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Jeremy Liberman
28aed34284 Prevent request forgery exploit in card.dm 2014-05-13 22:36:16 -05: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
Zuhayr
df7a589bd4 Made drone control consoles buildable/researchable. 2014-05-12 14:51:42 +09:30
Zuhayr
4da14198cf Stops drones from self-destructing or being locked down by the RD console. 2014-05-12 13:06:18 +09:30
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Hubblenaut
4dbd3252c9 No 'Record Lost' or different records when printing out Medical/Security Records and switching to another record 2014-05-06 05:37:03 +02:00
Hubblenaut
d1d42d7c35 Ability to access Medical Console by clicking it with ID card 2014-05-06 03:59:54 +02:00
Hubblenaut
7908142f16 Adds Station Time to Crew Manifest Printouts 2014-05-06 03:43:10 +02:00
Hubblenaut
0ddba6d771 Adds Crewmember's name to Medical and Security Record Printouts 2014-05-06 03:36:11 +02:00
Hubblenaut
d803f98ec1 Removes 'paper -' prefix from printed crew manifest 2014-05-06 03:20:13 +02:00
Intercross21
aa7ad269ae Little change: "show" button shows job only first time. Now shows job anytime. 2014-05-05 07:20:26 +04:00
Intercross21
e05efd0f1e New job menu for ID computer. 2014-05-04 22:06:56 +04:00
Ccomp5950
20e2991af3 Merge pull request #4762 from mwerezak/holotable 
Fixes #4649
 2014-04-16 22:19:53 -05:00
Ccomp5950
bf37f177de Merge pull request #4761 from thelegendofbrian/test 
Fixed typos
 2014-04-16 22:19:15 -05:00
Mike
ece286f14a Fix for #4649 2014-04-16 16:49:40 -04:00