cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,437 Commits 10 Branches 0 Tags
a29e52b10c444bb6602012f64652c7cf3c44d5d5
Commit Graph

184 Commits

Author SHA1 Message Date
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Mloc-Argent
49890421f8 Adds a C library alternative to the ircbot nudge script. 
This allows for more secure and stable transmission on Linux, but you might see some improvements on Windows too.
Code lies in (confusingly) lib/src.
nudge.c should be compiled to lib/nudge.[dll/so] and be linked against netutil.c.

There's some horribly hacky code in nudge.c to assemble pickled data, but it's probably the fastest way that's still safe.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-03-04 10:08:17 +00:00
Ccomp5950
8f2d5e817f Configuration option: Ability to set ERT to be admin call only. 
Admin request.

Default behavior is what we're used to, that two heads can call for the ERT
with the option turned on it removes the ability for players to call for an ERT and requires admin intervention.
 2014-03-02 06:20:26 -06:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag 
Conflicts:
	icons/mob/uniform.dmi
 2014-02-04 23:55:27 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Segrain
55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
Mark Aherne (Faerdan)
909c873b2e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-05 02:48:44 +00:00
Mark Aherne (Faerdan)
6d9368d949 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs 
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.
 2014-01-05 02:48:15 +00:00
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Zuhayr
e642b3e7e7 Merge pull request #4175 from Mloc/runtimelog 
Fixes runtime logging and makes it a config option.
 2014-01-02 17:46:28 -08:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Mloc-Argent
bd3a1718c4 Fixes runtime logging and makes it a config option. 
Option starts off by default, since that could be seen as the original behavior...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-02 21:38:15 +00:00
Mloc-Argent
df5fd9555c Fix for the roundstart hook "runtime". 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-01 19:10:55 +00:00
Zuhayr
85ad2363c4 Added config toggle for ghost writing (for adminbus). 2013-12-28 23:53:20 +10:30
Zuhayr
df38d75131 Added config values for ghost writing. 2013-12-28 23:30:23 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
RavingManiac
6f067f4b4f Removed two variables accidentally copied over from dev 2013-12-19 20:39:10 +08:00
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default) 
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
 2013-12-18 16:56:49 +08:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled. 
added antag options menu.
added ability to choose where a syndicate uplink is installed.
 2013-11-29 17:02:23 -08:00
Mloc-Argent
5e34c0e056 Hmm hmm, it could help to actually commit the hooks.dm file, couldn't it? 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-25 21:19:58 +00: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
jack-fractal
ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
	code/controllers/verbs.dm
 2013-11-23 11:58:50 -05:00
Zuhayr
f359919623 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:11 +10:30
jack-fractal
5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
 2013-11-22 20:30:23 -05:00
DJSnapshot
983ca2d5e3 Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller 2013-11-21 17:44:31 -08:00
Zuhayr
d1e6094a77 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-20 17:50:01 +10:30
jack-fractal
cf5012ce1d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-17 16:30:42 -05:00
jack-fractal
c6ec432904 - major update to all systems 
- creating the mask entity
- modifying the code for cult icons
- updating the camera net
- adding visibility network updates to all mobs
- unifying the culting and deculting process
- adding "Make Mask" function to Player Panel
 2013-11-17 16:23:36 -05:00
DJSnapshot
9936a9251f Helps to add the actual new file. 2013-11-17 11:55:57 -08:00
DJSnapshot
b75380985e Using a better method to handle autotransfers. Old method was silly. 2013-11-17 11:54:43 -08:00
Ccomp5950
dbf24606bd The Ghost AntagHUD Feature. 
Created configurations for Server Admins to be able to toggle it within default config.

Modified my previous AdminVerb that allows respawns to bypass the limitations of the restrictions while also letting the admins know if the ghost has used AntagHUD

Created restriction checks for various forms of joining the round and if administrators/hosts have restricted AntagHUD users from joining the round they will not be able to.

To Do:
Create Adminverb for toggling restrictions to also be able to toggle everyones ability to use antagHUD for a round.
Create a method for "Job Banning" users from using antagHUD.
 2013-11-17 17:29:29 +00:00
DJSnapshot
acc94c6f85 Fix for auto-transfer being called every 10 minutes after the first 3 hours. 2013-11-02 18:11:09 -07:00
DJSnapshot
aeff49f742 Small fix so voting isn't always shouting at you for not being an admin or mod. 2013-10-26 22:49:16 -07: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
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix 
Auto-transfer voting Redux: Episode 2.
 2013-09-30 07:53:49 -07:00
DJSnapshot
f956971fdf Small change to code. (Was locking up game ticker.) 2013-09-29 22:13:58 -07:00
DJSnapshot
1a48a2b6b0 Auto-transfer voting! 2013-09-29 12:05:10 -07:00
DJSnapshot
dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
d658b256e3 Fix for announcing gamemode ties. 2013-09-13 19:42:54 +03:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00